housekeeping
Merge branch 'master' into calendar
fixed users
Merge pull request #19 from mkmizuta/calendar

Calendar