use content_type_name now
Merge branch 'master' of github.com:medusa-project/medusa-rails3