lots of changes
Merge branch 'master' of https://github.com/gfortin13/db-proj

Conflicts:
	application/controllers/event_creation.php