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

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