Solucionado conflicto con boostrap y rails_admin
Merge remote-tracking branch 'origin/pedidos' into pedidos

Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css
Adaptado asignacion de estados al pedido
Merge remote-tracking branch 'origin/pedidos' into factura

Conflicts:
	app/assets/javascripts/bootstrap-invinyx.js
css3