Merge pull request #6 from Elffers/calendar

Calendar
cleanup
Merge branch 'master' into calendar
changed events user id to host id and modified specs