Update.
Merge remote-tracking branch 'origin/avtale' into MoteAvtale

Conflicts:
	Fellesprosjekt/src/calendar/Avtale.java