Evento

Evento
Merge branch 'master' of https://github.com/Tokem/beep-api

Conflicts:
	application/controllers/EventoListController.php
	application/models/Evento.php
	docs/BD/beep_database.mwb
	docs/BD/beep_database.mwb.bak