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

Conflicts:
	bibliothek/component/result.0.1.0.html
	code/array.0.1.0.js
	component/button.0.1.0.html
	component/list.0.1.0.html
	component/search.0.1.0.html
	component/time.0.1.0.html