Merge branch 'master' of /Users/jesperbruun/Sites/Dev/ServerCalendar with conflicts.
Joins