Merge branch 'release/1.2.0' into develop
Merge branch 'hotfix/1.2.1' into develop
fix indentation
refactor out assets
minify javascript files
Merge branch 'feature/compressjs' into develop
fix uglify gulpfile
Merge branch 'release/1.3.1'