new tests
Merge branch 'master' of https://github.com/alewg/ContractTest2

Conflicts:
	build/test/results/TEST-FerryTest.xml