Merge branch 'master' into develop
Adding a few more js-* classes into default templates
Bug fixes and compression improvements in gallery.js
Merge branch 'develop'