actualizacion para merge de clientes
Merge branch 'luis' of https://github.com/PublialemDev/solaris into luis

Conflicts:
	application/controllers/clientes/cClientes.php
	application/models/clientes/mClientes.php
	application/views/clientes/vClientesInsert.php