Made showCalendars work :) :)
Merge branch 'master' of https://github.com/aleksanb/fellesprosjektet

Conflicts:
	src/gui/MenuPanel.java