merge
Merge branch 'master' of https://github.com/ShaastraWebops/frontend

Conflicts:
	projects/main/php/misc/poll.csv
	projects/main/php/pages/error_log