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

Conflicts:
	bibliothek/code/model.0.1.0.js
	code/matrix.js