Merge remote-tracking branch 'origin/dev-v7' into dev-v7-deploy

src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs

@@ -413,6 +413,8 @@ namespace Umbraco.Core.Persistence.Repositories
             {
                 foreach (var property in entity.Properties)
                 {
+                    if (keyDictionary.ContainsKey(property.PropertyTypeId) == false) continue;
+
                     property.Id = keyDictionary[property.PropertyTypeId];
                 }
             }

src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs

@@ -365,6 +365,8 @@ namespace Umbraco.Core.Persistence.Repositories
             {
                 foreach (var property in ((Member)entity).Properties)
                 {
+                    if (keyDictionary.ContainsKey(property.PropertyTypeId) == false) continue;
+
                     property.Id = keyDictionary[property.PropertyTypeId];
                 }
             }

src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html

@@ -12,7 +12,7 @@
         <li class="span3" ng-repeat="pck in packages">
             <a href ng-click="setPackageAndContinue(pck.id)" class="thumbnail">
                 <small>Loading...</small>
-                <img ng-src="http://our.umbraco.org{{pck.thumbnail}}" alt="{{pck.name}}">
+                <img ng-src="http://our.umbraco.org{{pck.thumbnail}}?width=170" alt="{{pck.name}}">
             </a>
         </li>
     </ul>