Merge origin/master into User_Setup

Conflicts:
	src/java/Web/Controller.java
	web/index.html