SOmething...
Merge branch 'production' of github.com:ShaastraWebops/frontend into production

Conflicts:
	projects/main/php/pages/event.php
Fixed merge of datatable
Merge branch 'production' of github.com:ShaastraWebops/frontend into production