Merge origin/master

Conflicts:
	js/lib.js