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

Conflicts:
	bibliothek/component/scroll.0.1.0.html
	bibliothek/component/time.0.1.3.html