actualizando el proyecto
Merge branch 'luis' of https://github.com/PublialemDev/solaris into luis

Conflicts:
	application/helpers/pagina_helper.php