2 of 4 Merchant extensions coded and tested
finished 3 of 4 Merchant extensions
completed and tested Merchant extension
completed 1 of 5 invoice extensions
completed and tested 2 of 5 invoice extensions
completed and tested 3 of 5 invoice_extensions
completed and tested 4 of 5 invoice extensions
completed and tested 5 of 5 invoice_extensions
removed comments
fixed merge conflict between merchant and invoice extensions
merged and tested invoice and merchant extensions into master