Merge origin/master

Conflicts:
	www/style/app.css