gulp
Merge branch 'feature/passport' of https://github.com/jonniespratley/angular-cms into feature/passport

Conflicts:
	gulpfile.js