lifu view
Merge branch 'master' of https://github.com/cosimo-dw/NamingSaaS

Conflicts:
	app/views/messages/_message.html.erb
	app/views/orders/show.html.erb
lifu view