order show
Merge branch 'master' of https://github.com/cosimo-dw/NamingSaaS

Conflicts:
	app/views/orders/_order.html.erb
	config/routes.rb
fix
fix error lf
fix