Testing CreateUser - new mock classes
Merge remote-tracking branch 'origin/master'

Conflicts:
	swe400fitness/src/mapper/FriendMapper.java
Revert "Testing CreateUser - new mock classes"

This reverts commit 7684edac10cef4bd8fad8989e1c3155752ebe262.