less arreglado
otro commit
Merge branch 'master' of https://github.com/maykultman/panques

Conflicts:
	application/views/cabecera_y_menu.php

	modified:   application/views/cabecera_y_menu.php
	modified:   application/views/clientes.php
	modified:   application/views/usuarios.php
	modified:   application/views/usuarios_consulta.php
	modified:   css/estilos_menu_cabecera.less
	modified:   js/backbone/vistas/VistaUsuario.js