arreglos+ficha
arreglo parte 2
Merge remote-tracking branch 'origin/ci' into ci

Conflicts:
	web/application/config/routes.php
	web/application/views/ficha_servicio_view.php