Merge origin/master

Conflicts:
	src/java/servlets/Factory.java
Merge origin/master