Merge branch 'master' of github.com:ShaastraWebops/shaastra_temporary_mainsite

Conflicts:
	templates/events/small/event_page.html
Merge branch 'master' of github.com:ShaastraWebops/shaastra_temporary_mainsite

Conflicts:
	templates/events/small/event_page.html