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

Conflicts:
	fwadmin/tests/test_views.py
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
fix merge artifact
fix another merge artifact
always show owner/owner2 in the host list
fix test_index_has_host() test, too narrow
ensure owner!=owner2 and owner2 is in the right group
Merge pull request #23 from mvo5/feature/owner2

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

Conflicts:
	fwadmin/views.py