fix typo
change "from django_project.settings" to correct "from django.conf import settings" to allow override of the settings via the DJANGO_SETTINGS_MODULE environment
use django1.5+ url style from future for the templates
add a bunch of missing i18n markup tags
add german django.po
cleanup TODO
fix typo
more i18n fixes (thanks to Pter)
update translation, thanks to Christopher
update translation, thanks to Christopher
fix encoding via "iconv -f latin1 -t utf8"
more i18n fixes
Merge branch 'master' into bugfix/i18n

Conflicts:
	fwadmin/locale/de/LC_MESSAGES/django.po
more i18n translation fixes
add i18n to the fwadmin/model.py to get a fully i18n form
add another missing blocktrans
fix pep8 error and add verbose_name to models.GenericIPAddressField
more translations
fix incorrect var in translation
add redirect