added edit mode to transformation
Merge branch 'develop'