needed to commit to pull, wrong refs in file AddAppointmentView, Appointment and Room
.
Merge branch 'master' of https://github.com/mathiasose/fellesprosjekt

Conflicts:
	java_app/src/addAppointment/AddAppointmentView.java
	java_app/src/model/Appointment.java
	java_app/src/model/Invitation.java
	java_app/src/model/Room.java
	java_app/src/model/User.java
fixed an error i AddAppointmentView (missing model variable)