yre
Merge branch 'master' of https://github.com/annakeren/EventsManager

Conflicts:
	application/controllers/event.php
	application/views/event_view.php