Merge origin/master

Conflicts:
	src/java/Model/UserScore.java
	web/WEB-INF/web.xml
Merge origin/master

Conflicts:
	src/java/Model/UserScore.java
	web/WEB-INF/web.xml
Merge origin/master

Conflicts:
	src/java/Model/ConnectionBuilder.java