update
Merge branch 'master' of https://github.com/epha/verlauf

Conflicts:
	component/awe.4.1.0.html
	component/navi.0.1.0.html