lista de eventos propios
Merge remote-tracking branch 'origin/master'

Conflicts:
	backend/event/EventController.php