added grunt uglify
Merge branch 'feature-uglify' into develop