Fixed stuff with the events page that nikhil broke
Merge branch 'develop' of https://github.com/nhandyal/scia into develop