Fix onCLick in upcoming events
Merge branch 'master' of https://github.com/sdsmdg/Cognizance
Merge branch 'master' of https://github.com/sdsmdg/Cognizance
Fix upcoming events