wip
events show on calendar
Merge branch 'master' into crystal
Merge pull request #45 from callapatel/crystal

Crystal