Merge master into HEAD

Conflicts:
	web/index.html
Merge origin/vivek into vivek
Merge master into HEAD

Conflicts:
	web/index.html