Implemented editMeeting
Merge branch 'master' of ssh://git@github.com/jonasws/Fellesprosjekt.git

Conflicts:
	Fellesprosjekt/src/calendar/ConsoleUI.java
	Fellesprosjekt/src/messages/MessageHandler.java
Merge branch 'master' of ssh://git@github.com/jonasws/Fellesprosjekt.git