Merge origin/master

Conflicts:
	www/index.html
	www/scripts/app.js
Merge origin/master
Merge origin/master