Added delete "x" to project
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/app/controllers/teamListCtrl.js