Fix build errors after merge

--HG--
branch : dev

src/Orchard.Tests/Utility/Extensions/StringExtensionsTests.cs

@@ -1,5 +1,5 @@
 using NUnit.Framework;
-using Orchard.Extensions;
+using Orchard.Utility.Extensions;
 
 namespace Orchard.Tests.Utility.Extensions {
     [TestFixture]

src/Orchard.Web/Modules/Orchard.Media/Controllers/AdminController.cs

@@ -3,12 +3,12 @@ using System.Collections.Generic;
 using System.IO;
 using System.Web;
 using System.Web.Mvc;
-using Orchard.Extensions;
 using Orchard.Localization;
 using Orchard.Media.Models;
 using Orchard.Media.Services;
 using Orchard.Media.ViewModels;
 using Orchard.UI.Notify;
+using Orchard.Utility.Extensions;
 
 namespace Orchard.Media.Controllers {
     [ValidateInput(false)]

src/Orchard/Utility/Extensions/StringExtensions.cs

@@ -14,5 +14,9 @@ namespace Orchard.Utility.Extensions {
 
             return cleanTailRegex.Replace(text.Substring(0, characterCount + 1), "") + ellipsis;
         }
+        public static bool IsNullOrEmptyTrimmed(this string text) {
+            if (text == null) return true;
+            return string.IsNullOrEmpty(text.Trim());
+        }
     }
 }