cambios que no se habian guardado
Merge branch 'master' of https://github.com/simgia/ecopyahu

Conflicts:
	fuentes/server/application/config/config.php
	fuentes/server/application/config/routes.php