update locales
Update locale
Merge branch 'feincms-master'

Conflicts:
	elephantblog/locale/de/LC_MESSAGES/django.mo
	elephantblog/locale/de/LC_MESSAGES/django.po
update locale