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

Conflicts:
	code/model.0.1.0.js