Merge remote-tracking branch 'origin/master'

Conflicts:
	client/app/controllers/teamListCtrl.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/app/controllers/project/newProjectModalCtrl.js
	client/app/controllers/team/teamCtrl.js
	client/app/controllers/user/userCtrl.js