cambios para la web
arreglado Merge remote-tracking branch 'origin/ci' into ci

Conflicts:
	web/application/config/autoload.php
	web/application/controllers/sitio.php
	web/application/controllers/usuario.php
	web/application/libraries/servicio_class.php
	web/application/libraries/usuario_class.php
	web/system/core/Common.php