Push/pull translations from transifex
Merge branch 'master' into next

* master:
  Push/pull translations from transifex

Conflicts:
	feincms/locale/de/LC_MESSAGES/django.mo
	feincms/locale/de/LC_MESSAGES/django.po