Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0

build/Build.bat

@@ -1,6 +1,6 @@
 @ECHO OFF
 SET release=7.0.0
-SET comment=alpha
+SET comment=beta
 SET version=%release%
 
 IF [%comment%] EQU [] (SET version=%release%) ELSE (SET version=%release%-%comment%)

src/Umbraco.Core/Configuration/UmbracoVersion.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Reflection;
 
 namespace Umbraco.Core.Configuration
@@ -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 "alpha"; } }
+        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.Client/src/views/propertyeditors/relatedlinks/relatedlinks.html

@@ -10,7 +10,7 @@
                 </tr>
             </thead>
             <tbody>
-                <tr ng-repeat="link in $scope.model.value">
+                <tr ng-repeat="link in model.value">
                     <td>
                         <span ng-show="!link.edit">{{link.caption}}</span>
                         <input type="text" ng-model="link.caption" ng-show="link.edit"/>