Configuración
Merge branch 'master' of ssh://git@github.com/raalveco/aspos.git

Conflicts:
	app/controllers/configuracion_controller.php
	app/views/configuracion/index.phtml