moved test
Merge remote-tracking branch 'origin/master'

Conflicts:
	CricketRegistrationApp/app/views/manage/testing.html.erb