Merge origin/master

Conflicts:
	initialDB.sql
	web/index.jsp
	web/tool-detail.jsp
Merge origin/master