Merge branch 'NewAppointmentV3'

Conflicts:
	src/no/ntnu/pu/gui/panel/AddRoom.java
	src/no/ntnu/pu/gui/view/AppointmentView.java