code tidy up
Merge branch 'master' of https://github.com/uoa-group-applications/soaunit

Conflicts:
	src/test/java/nz/ac/auckland/integration/tests/mock/MockDefinitionBuilderTest.java
fixed stringing together endpoints in the same test