Merge branch 'develop'
Minifying js
Minifying js