Merge branch 'dashboard' of github.com:ShaastraWebops/shaastra_temporary_mainsite into dashboard

Conflicts:
	dashboard/ajax.py
	templates/dashboard/modal_regd.html
Merge branch 'dashboard' of github.com:ShaastraWebops/shaastra_temporary_mainsite into dashboard

Conflicts:
	dashboard/ajax.py