Change model name lookup in controller
Merge branch 'change_model_name_lookup'

Conflicts:
	app/controllers/carnival/base_admin_controller.rb