From server
Merge branch 'production' of https://github.com/ShaastraWebops/frontend into production

Conflicts:
	projects/main/php/pages/home.php