mas o menos rula
Merge branch 'Tags' into nuevoEvento

Conflicts:
	protected/controllers/EventoController.php