Edit merge fix events.php
 Changes to be committed:
	modified:   php/pages/events.php
Edit merge fix main.php
 Changes to be committed:
	modified:   php/main.php
Edit merge fix util.php
 Changes to be committed:
	modified:   php/util.php