Merge origin/master

Conflicts:
	.gitignore
	web/index.html