Gulp fixing.
Merge branch 'master' of github.com:CoderDojoChi/survy

Conflicts:
	dev/scripts/admin.js