Merge branch 'develop'
Merge pull request #1 from aneesece/develop

Develop
Merge pull request #2 from aneesece/develop

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