Merge origin/master

Conflicts:
	public_webapp/WEB-INF/classes/src/java/asw1009/model/UsersManager.java
	public_webapp/applet/ASW_Applet1.jar
	public_webapp/applet/ASW_Lib1.jar