Merge branch 'feature/gulpBuild' into develop