Updates to gulp process
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/vm.js
	gulpfile.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/vm.js
	gulpfile.js
	package.json