updated 7/16
7.16

Conflicts:
	application/controllers/event.php