gulpfile
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/build/js/app.js
	gulpfile.js