restruct code + refresh calendar
Merge branch 'master' of github.com:mokujin90/madam
fix calendar event