Cancel funksjonalitet
Merge branch 'master' of https://github.com/Assios/fellesprosjekt

Conflicts:
	bin/GUI/createNewMeetingPanel.class
Merge branch 'master' of https://github.com/Assios/fellesprosjekt
Merge branch 'master' of https://github.com/Assios/fellesprosjekt
litt funskjonalitet