Hide non-approved challenges
Redefined visible states a little
Fixed test
Pre-merge commit
Merge branch '404routing' into hotfix
Friendlier error messages
Merged branches & set error messages
Conflicts:
	app/controllers/application_controller.rb