Merge branch 'austria' into unipiraten
fixes
Merge branch 'austria' into unipiraten
so many icons
more icons
so many icons

Conflicts:
	app/main/unit/show.lua
more icons

Conflicts:
	app/main/_filter_view/30_navigation.lua
	app/main/member/rights.lua
Merge branch 'unipiraten' into austria