integrated event display
Merge branch 'master' of https://github.com/DevelopersGuild/devCal
combined saleh and josh's code