when editing, tapping scaleVC will resign first responder
Merge remote-tracking branch 'origin/master'