Gear front end editable.
Merge branch 'develop'