borrar servicios
Merge remote-tracking branch 'origin/ci' into ci

Conflicts:
	web/application/controllers/sitio.php
	web/application/models/servix_model.php