Merge pull request #78 from timschofield/develop

Develop
Fix bug on customer selection for a new contract
Merge pull request #79 from fahadhatib/develop

Fix bug on customer selection for a new contract