add missing {% load url from future %}
add missing fwadmin/migrations/0001_initial.py
Merge branch 'master' into feature/south
Merge branch 'master' into feature/south

Conflicts:
	REQUIREMENTS
add /export/cicso/ and /export/ufw/ URLs
export as text/plain
add all hosts overview (very basic) for now
Merge branch 'master' into feature/show-all
Merge branch 'master' into feature/export
Merge branch 'master' into feature/south
add migration
update requirements.txt location
add missing genrules.py
Merge remote-tracking branch 'origin/feature/ansible' into feature/ansible
Merge pull request #10 from mvo5/feature/show-all

add all hosts overview (very basic) for now
Merge pull request #6 from mvo5/feature/south

Feature/south
Merge branch 'master' into feature/ansible

Conflicts:
	REQUIREMENTS
make failing import of ldap_auto_discover non-fatal
change AUTH_LDAP_BIND_DN
Merge branch 'feature/export' into feature/ansible