Merge branch 'master' into PersonControl,GroupControl

Conflicts:
	src/no/ntnu/pu/model/Appointment.java
	src/no/ntnu/pu/storage/ServerStorage.java