Fix map & gp_calendar
Merge branch 'master' of https://github.com/zomeki/zomeki-development
Merge pull request #39 from ozamasa/master

Fix map & gp_calendar