Merge pull request #44 from callapatel/crystal

Crystal
wip
events show on calendar
Merge branch 'master' into crystal