registro y servicios

Signed-off-by: Leo Vega <leovp17@gmail.com>
Merge branch 'master' of https://github.com/nabica/cruzroja

Signed-off-by: Leo Vega <leovp17@gmail.com>

Conflicts:
	html/system/application/models/web/cservicios.php