Fikset siste to issues
Merge remote-tracking branch 'origin/master' into deleteAppointment

Conflicts:
	Fellesprosjekt/src/main/meeting/MeetingController.java
Merge pull request #71 from bflugon/deleteAppointment

Fikset siste to issues