Merge origin/master

Conflicts:
	app.js
Merge origin/master