merge
Merge branch 'master' of https://github.com/epha/consilium

Conflicts:
	code/library.0.1.7.js