Merge origin/master

Conflicts:
	web/index.jsp