Huge refactor that touched many classes in order to add two columns to
both FRIENDS and PENDINGFRIENDREQUESTS that contain UserDisplayNameA and
UserDisplayNameB.  All tests still pass except for
UserFriendRequestMapper tests and one of the command's tests.  Fixing
that now.