Make the controller dependency chain more explicit.

TavernaPlayer::ApplicationController should subclass the host app
ApplicationController, not ActionController::Base. This is now more explicit for
Rails 3 and should work correctly for Rails 4 too; Rails 4 detects an erroneous
circular dependency without the explicit :: prefix.
Merge remote-tracking branch 'origin/master' into rails4

* origin/master:
  Make the controller dependency chain more explicit.

Conflicts:
	app/controllers/taverna_player/application_controller.rb
Restore the template tests so they test the correct thing.

Now the correct hierarchy is restored for TavernaPlayer::ApplicationController
the correct layouts are being returned again, so switch the tests back to
reflect this.