Changed stuff in events
Merge branch 'master' of https://github.com/ShaastraWebops/shaastra_temporary_mainsite