uglifying and concatting js
Merge branch 'develop'