Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs

OpenSim/Services/HypergridService/UserAgentService.cs

@@ -564,6 +564,16 @@ namespace OpenSim.Services.HypergridService
 
             return string.Empty;
         }
+
+        public UUID GetUUID(String first, String last)
+        {
+                        // Let's see if it's a local user
+            UserAccount account = m_UserAccountService.GetUserAccount(UUID.Zero, first, last);
+            if (account != null)
+                return account.PrincipalID;
+            else
+                return UUID.Zero;
+        }
     }
 
     class TravelingAgentInfo