ContractDB , more user interface testing
trying to solve merge conflict
Merge branch 'master' of https://github.com/pjfoi/projectNet.git
Merge branch 'master' of https://github.com/pjfoi/projectNet.git