Merge origin/master

Conflicts:
	app/index.html
	app/scripts/app.js