Make shapes resizable

Merged Ghost User requested to merge make_shapes_resizable into master

Merge request reports