Merge remote-tracking branch 'zimk/master' into feature/owner2

Conflicts:
	fwadmin/tests/test_views.py
add owner2 tests
Merge branch 'feature/owner2' of github.com:mvo5/fwadmin into feature/owner2

Conflicts:
	fwadmin/tests/test_views.py
	fwadmin/views.py