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

Conflicts:
	bibliothek/code/app.0.1.0.js
	bibliothek/code/control.0.1.0.js
	bibliothek/component/info.0.2.0.html
	bibliothek/component/orbit.0.1.0.html