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

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