Respuesta 2222
Merge branch 'master' of git://github.com/fau09/ieventto

Conflicts:
	application/controllers/panel/eventos.php