More stuff
Merge branch 'master' of github.com:konzilo/calendar_backend