Camsbios Abogados y Clientes
Merge branch 'master' of https://github.com/FICECode/SmashProject

Conflicts:
	application/controllers/Configuracion.php
	application/controllers/Facturas.php
	application/controllers/Graficas.php
	application/controllers/Reportes.php
	application/models/AbogadoModel.php
	application/views/login/index.php