Moved Team Generation Around
Merge remote-tracking branch 'origin/master'

Conflicts:
	CricketRegistrationApp/app/controllers/manage_controller.rb