Merge branch 'master' into pure-alt

Conflicts:
	index.html
	js/app.js