Minor changes
Minor changes
Merge remote-tracking branch 'origin/development' into development
Minor changes
Merge remote-tracking branch 'origin/development' into development
Invoices and Receipts
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	app/views/layouts/_header.html.erb
Header