add new invoices and invoice objects done
uncommented the merchant tests
Merge branch 'invoice_bi'