Merged Consumer and BusinessCustomer class. FROM NOW ON PLEASE JUST USE CUSTOMER
Merge remote-tracking branch 'origin/master'