Merge origin/master

Conflicts:
	app.js