awesome
Merge branch 'master' of https://github.com/epha/verordnung

Conflicts:
	component/navi.0.1.0.html