Merge pull request #698 from leider/master

small changes in wiki
Renamed userMock to userStub because it is a stub and not a mock.
Merge pull request #699 from NicoleRauch/master

Renamed userMock to userStub because it is a stub and not a mock.