Edit Event functionality
Merge branch 'master' of https://github.com/BBackerry/COMP353

Conflicts:
	application/controllers/Event.php