Merge branch 'inherited_resources_resource_name'
Merge branch 'change_model_name_lookup'

Conflicts:
	app/controllers/carnival/base_admin_controller.rb
Fix Carnival field translations
Merge pull request #86 from cartolari/fix_translations

Fix translations