Merge

src/Umbraco.Core/Configuration/UmbracoVersion.cs

@@ -23,7 +23,7 @@ namespace Umbraco.Core.Configuration
         /// Gets the version comment (like beta or RC).
         /// </summary>
         /// <value>The version comment.</value>
-        public static string CurrentComment { get { return ""; } }
+        public static string CurrentComment { get { return "Beta"; } }
 
         // Get the version of the umbraco.dll by looking at a class in that dll
         // Had to do it like this due to medium trust issues, see: http://haacked.com/archive/2010/11/04/assembly-location-and-medium-trust.aspx

src/Umbraco.Web.UI/config/umbracoSettings.Release.config

@@ -5,7 +5,7 @@
       <!-- what file extension that should cause umbraco to create thumbnails -->
       <imageFileTypes>jpeg,jpg,gif,bmp,png,tiff,tif</imageFileTypes>
       <!-- what attributes that are allowed in the editor on an img tag -->
-      <allowedAttributes>alt,border,class,style,align,id,name,onclick,usemap</allowedAttributes>
+      <allowedAttributes>src,alt,border,class,style,align,id,name,onclick,usemap</allowedAttributes>
       <!-- automatically updates dimension, filesize and extension attributes on upload -->
       <autoFillImageProperties>
         <uploadField alias="umbracoFile">

src/Umbraco.Web.UI/config/umbracoSettings.config

@@ -5,7 +5,7 @@
             <!-- what file extension that should cause umbraco to create thumbnails -->
             <imageFileTypes>jpeg,jpg,gif,bmp,png,tiff,tif</imageFileTypes>
             <!-- what attributes that are allowed in the editor on an img tag -->
-            <allowedAttributes>alt,border,class,style,align,id,name,onclick,usemap</allowedAttributes>
+            <allowedAttributes>src,alt,border,class,style,align,id,name,onclick,usemap</allowedAttributes>
             <!-- automatically updates dimension, filesize and extension attributes on upload -->
             <autoFillImageProperties>
                 <uploadField alias="umbracoFile">