Optimizando frontend
Merge branch 'pedidos' into factura

Conflicts:
	app/assets/stylesheets/application.css
	app/assets/stylesheets/bootstrap_and_overrides.css
	app/controllers/devolucions_controller.rb
	app/views/devolucions/index.html.haml
Facturas y Proveedores
css
css 2
Merge remote-tracking branch 'origin/pedidos' into factura

Conflicts:
	app/assets/javascripts/bootstrap-invinyx.js
css3
Merge remote-tracking branch 'origin/factura' into pedidos