minor fixes in french translation
Add/update compiled gettext catalogs
Merge branch 'master' into next

* master:
  Add/update compiled gettext catalogs
  minor fixes in french translation
TINYMCE_DOMAIN for cross-subdomain support
Also slugify ImageContent.get_format_display for more flexible/robust styling.
Fix PageAdmin.add_view: title should be a Unicode string otherwise ugettext will raise UnicodeDecodeError when 'language' or 'page.title' is not in ASCII.
Merge pull request #429 from jimmyye/master

Fix PageAdmin.add_view
Merge pull request #428 from DrMeers/next

TINYMCE_DOMAIN for cross-subdomain support
Merge branch 'master' into next

* master:
  Fix PageAdmin.add_view: title should be a Unicode string otherwise ugettext will raise UnicodeDecodeError when 'language' or 'page.title' is not in ASCII.
display a confirmation page before deleting pages
Added support for setting custom django permissions in content types

Currently FeinCMS ignores custom permissions which are set in content type
models.
So, for example, this code will not work as expected (defined permissions are
ignored):

    class SomeCustomContent(models.Model):
        ...
        class Meta:
            abstract = True
            permissions = (
                ("view_task", "Can see available tasks"),
                ("change_task_status", "Can change the status of tasks"),
                ("close_task", "Can remove a task"),
            )


This change adds support for custom permissions in content type models.
css hacks for django-suit compatibility
Trigger djangos inline deletion handler when removing an unsaved content. Poorify all other contents before, and richify them afterwards to keep the richtext editors working.
Merge branch 'master' of https://github.com/andrinheusser/feincms into next

* 'master' of https://github.com/andrinheusser/feincms:
  display a confirmation page before deleting pages
  Fix PageAdmin.add_view: title should be a Unicode string otherwise ugettext will raise UnicodeDecodeError when 'language' or 'page.title' is not in ASCII.

Conflicts:
	feincms/admin/tree_editor.py
Merge branch 'patch-1' of https://github.com/apopelo/feincms into next

* 'patch-1' of https://github.com/apopelo/feincms:
  Added support for setting custom django permissions in content types
Merge branch 'django-suit-compatibility' of https://github.com/schmidsi/feincms into next

* 'django-suit-compatibility' of https://github.com/schmidsi/feincms:
  css hacks for django-suit compatibility
Merge branch 'master' of https://github.com/fabiangermann/feincms into next

* 'master' of https://github.com/fabiangermann/feincms:
  Trigger djangos inline deletion handler when removing an unsaved content. Poorify all other contents before, and richify them afterwards to keep the richtext editors working.
Merge remote-tracking branch 'official/next' into next

* official/next:
  Also slugify ImageContent.get_format_display for more flexible/robust styling.
  TINYMCE_DOMAIN for cross-subdomain support
FeinCMSModelAdmin breaks when using a custom model manager

Does not use first manager in model like Django's admin does, which might conflict with the objects Manager.
Rename argument to queryset and work with it directly