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

Conflicts:
	templates/home/login.html
Merge branch 'master' of github.com:ShaastraWebops/shaastra_temporary_mainsite