Correccion
Merge branch 'master' of https://github.com/jonathanaraul/ceis

Conflicts:
	application/controllers/admin.php