Added from server
Merge branch 'master' of https://github.com/ShaastraWebops/shaastra_temporary_mainsite

Conflicts:
	templates/base/navbar.html