update translation, thanks to Christopher
Merge branch 'master' into feature/ansible

Conflicts:
	fwadmin/locale/de/LC_MESSAGES/django.po
add django.middleware.locale.LocaleMiddleware
Merge remote-tracking branch 'origin/feature/ansible' into feature/ansible