Merge

--HG--
branch : dev

src/Orchard.Specs/Hosting/Orchard.Web/Web.config

@@ -86,7 +86,7 @@
             it enables developers to configure html error pages 
             to be displayed in place of a error stack trace.
     -->
-    <customErrors mode="Off"/>
+    <customErrors mode="RemoteOnly"/>
     <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID">
       <namespaces>
         <add namespace="System.Web.Mvc"/>

src/Orchard.Web/Themes/TheAdmin/Views/Menu.cshtml

@@ -31,7 +31,7 @@
         var firstLevelTag = Tag(firstLevelMenuItem, "li");
         @firstLevelTag.StartElement
             <h3>@sectionHeaderMarkup</h3>
-            if (secondLevelMenuItems.Count() > 1) {
+            if (secondLevelMenuItems.Count() > 1 || !firstLevelMenuItem.LinkToFirstChild) {
                 <ul class="menuItems">
                 @foreach(var secondLevelMenuItem in secondLevelMenuItems) {
                     <li>

src/Orchard.Web/Web.config

@@ -96,7 +96,7 @@
             it enables developers to configure html error pages 
             to be displayed in place of a error stack trace.
     -->
-    <customErrors mode="Off" />
+    <customErrors mode="RemoteOnly" />
     <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID">
       <namespaces>
         <add namespace="System.Web.Mvc"/>