Added defaultCustomers
Fixed merge conflicts
Merge pull request #24 from OSN64/RW-Develop

RW Develop/defaultCustomers