Merge remote-tracking branch 'origin/storage' into PersonControl,GroupControl

Conflicts:
	src/no/ntnu/pu/model/Appointment.java
	src/no/ntnu/pu/storage/ServerStorage.java
Merge remote-tracking branch 'origin/storage' into PersonControl,GroupControl

Conflicts:
	src/no/ntnu/pu/model/Appointment.java
	src/no/ntnu/pu/storage/ServerStorage.java
Merge remote-tracking branch 'origin/PersonControl,GroupControl' into PersonControl,GroupControl

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