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 all hosts overview (very basic) for now
Merge branch 'master' into feature/show-all
Merge branch 'master' into feature/south
add migration
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