Merge branch 'master' into develop
Added js zoom and responsive stuff
Merge branch 'develop'