work in progress
Merge remote-tracking branch 'origin/reception' into change_views

Conflicts:
	app/views/invoices/_sidebar.html.erb
	app/views/invoices/index.html.erb
view invoice
received invoices list view