UML updated
Merge pull request #253 from rjynn/noMockServer

No mock server
minor changes to documentation
Merge pull request #254 from tbrockman/noMockServer

minor changes to documentation
Merge pull request #255 from pachalad/noMockServer

UML updated
Merge remote-tracking branch 'upstream/noMockServer' into noMockServer