Agregado listado de obra y ver detalles de obra
gemlook borrado
Merge remote-tracking branch 'origin/obras' into devoluciones

Conflicts:
	app/models/pedido.rb
	app/views/layouts/body_page.html.haml
	app/views/layouts/navbar.html.haml
	config/routes.rb
merge