filters for event categories created
Merge branch 'master' of https://github.com/Valdocco/gemsontime

Conflicts:
	application/models/Event.php