Implement the new security mechanism
re-jigger the TournamentController#update to be all one case block
Merge branch 'master' into luke

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/tournaments_controller.rb