Create calendar og er master syncroniseret
Merge remote-tracking branch 'origin/master'

Conflicts:
	ServerTEO/src/CreateCalendarObject.java