Merge origin/master

Conflicts:
	app/index.html
Merge origin/master
Merge origin/master

Conflicts:
	app/index.html
Merge origin/master