Merge branch 'master' into gh-pages

Conflicts:
	README.md
	build/build.js
	test.html