Zoom feature
Merge branch 'feature_zoom' into develop
Merge branch 'develop'