Login and Registration done
Fixed some more things in reg/login
Merge branch 'master' of https://github.com/ShaastraWebops/shaastra_temporary_mainsite