Merge branch 'master' into gh-pages

Conflicts:
	index.html
	main.js