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