Merge branch 'master' into develop
Merge branch 'master' into develop
Merge branch 'master' into develop
update to gulp-webapp generator

-gulpfile updates
-delete temp gulpfile-new
-removed gulp-bower-files

Signed-off-by: Ryan Luton <ryan@lutonmedia.com>
Merge branch 'develop'