create events and routes cleaned up
fixed merge conflicts with master
Merge branch 'master' into calendar
Merge pull request #29 from mkmizuta/calendar

Calendar