fixed i18n
fixed i18n
Merge branch 'develop' of github.com:c-base/cbmi into develop

Conflicts:
	account/conf/locale/de/LC_MESSAGES/django.po
Merge branch 'hotfix/0.2.12'