Merge master into GavinUpdate

Conflicts:
	web/index.jsp