Split the calendar stuff into a separate controller/service
Merge branch 'master' of github.com:pixelandtonic/Events