Fixed the user/people merge to look for people that may not have also been contacts and add them in.  Corrected an issue where the call of GetUserRights with a UserID not in the table would return whatever the prior resultset had been.

Made the header show the current logged in UserID, whether using Apache or Oauth authentication.

#424