Merge origin/master

Conflicts:
	web/index.html
Merge origin/master

Conflicts:
	build.xml