Merge origin/master

Conflicts:
	src/java/model/lib/ProgServer.jar
	web/WEB-INF/web.xml