Merge branch 'master' of https://github.com/jesperbruunhansen/ServerCalendar

Conflicts:
	src/Model/Calendar/GetCalendarData.java
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/jesperbruunhansen/ServerCalendar

Conflicts:
	src/Model/Calendar/GetCalendarData.java