Merge pull request #50 from bflugon/Markus

Markus
Stor oppdatering for calendarController
Merge pull request #64 from bflugon/ConnectCalendarToGit

Stor oppdatering for calendarController
Merge pull request #63 from bflugon/Markus

Markus
Merge branch 'master' into Markus

Conflicts:
	Fellesprosjekt/src/main/calendar/calendar.fxml