display calendar
Merge branch 'master' into crystal
fix merge for calendar
Merge pull request #25 from callapatel/crystal

Crystal