pre merge
Merge branch 'master' of github.com:ucam-cl-dtg/urop-2014-tester

Conflicts:
	public/target/classes/publicinterfaces/ITestService.class
Bumped version to 0.2.1