team Modal updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/app/controllers/teamsCtrl.js
	server/controllers/teamController.js