Added customer relationship to Invoices
fixed merge issues
Merge pull request #56 from bmrsny/brandon13

Brandon13