commit

:D
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/catalogo_permisos.php

	modified:   application/views/catalogo_permisos.php
	modified:   application/views/catalogo_puestos.php
	modified:   application/views/catalogo_roles.php
	modified:   application/views/catalogo_servicios.php
	modified:   application/views/cliente_nuevo.php
	modified:   application/views/consulta_clientes.php
	modified:   application/views/consulta_prospectos.php
	modified:   application/views/contratos_nuevo.php
	modified:   application/views/cotizaciones_nuevo.php
	new file:   application/views/modal_correo.php
	modified:   application/views/proyectos_nuevo.php
	modified:   css/estilos_modulo_catalogos.css
	modified:   css/estilos_modulo_clientes_nuevo.less
	modified:   css/estilos_modulo_cotizaciones.less
	modified:   css/estilos_modulo_proyectos.css
	modified:   css/estilos_modulo_usuarios.css