Merge pull request #84 from cartolari/inherited_resources_resource_name

Fix the case where the constant does not exists
merge
Merge branch 'cartolari-change_model_name_lookup'
Merge pull request #86 from cartolari/fix_translations

Fix translations
Merge remote-tracking branch 'upstream/master'