fixtests
Revert build.py changes
Restore OmeroCpp build.xml
Fix bits of build.py
Resture OmeroCpp in global.xml
fixbuild
install