Merge branch 'dev-v7' into temp7-269-xss-stylesheets

# Conflicts resolved:
#	src/Umbraco.Core/StringExtensions.cs

src/Umbraco.Core/StringExtensions.cs

@@ -53,7 +53,7 @@ namespace Umbraco.Core
                 .Reverse()
                 .ToArray();
             return nodeIds;
-        }
+        }
 
         /// <summary>
         /// Removes new lines and tabs
@@ -190,7 +190,7 @@ namespace Umbraco.Core
             return new string(outputArray);
         }
 
-        private static readonly char[] CleanForXssChars = "*?(){}[];:%<>/\\|&'+\"".ToCharArray();
+        private static readonly char[] CleanForXssChars = "*?(){}[];:%<>/\\|&'\"".ToCharArray();
 
         /// <summary>
         /// Cleans string to aid in preventing xss attacks.