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

Conflicts:
	bibliothek/code/control.0.1.0.js
	bibliothek/component/orbit.0.1.0.html
	bibliothek/component/patient.1.0.0.html
	bibliothek/component/time.0.1.3.html
	bibliothek/style/master.css
	index.html