q
Merge remote-tracking branch 'origin/master'

Conflicts:
	CricketRegistrationApp/app/views/manage/index.html.erb
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit c93bf199f26beaa6b70eb44cd33c951d857c9118.