working on the manage team screen
Merge remote-tracking branch 'origin/master'

Conflicts:
	CricketRegistrationApp/app/controllers/manage_controller.rb