fix ldap autodiscover in production/staging
Merge branch 'feature/newUI' of github.com:soraphis/fwadmin into feature/newUI
Merge branch 'feature/newUI' of github.com:soraphis/fwadmin into feature/newUI
Merge branch 'feature/newUI' of github.com:soraphis/fwadmin into feature/newUI
Merge branch 'feature/newUI' of github.com:pgolm/fwadmin into feature/newUI
Merge branch 'feature/newUI' of github.com:mvo5/fwadmin into feature/newUI
yeah!!! another pep8 fix :D
Merge remote-tracking branch 'pgolm/feature/newUI'

Conflicts:
	fwadmin/templatetags/addcss.py
fix merge artifact
TRIVIAL: i18n update
Merge pull request #22 from mvo5/bugfix/ldap

fix ldap autodiscover in production/staging