Merge branch 'master' into gh-pages

Conflicts:
	scripts/js/init.js