9 files changed, 18 insertions, 8 deletions
diff --git a/WebContent/VAADIN/themes/base/dragwrapper/dragwrapper.scss b/WebContent/VAADIN/themes/base/dragwrapper/dragwrapper.scss
index 558b305742..9d60bf0618 100644
--- a/WebContent/VAADIN/themes/base/dragwrapper/dragwrapper.scss
+++ b/WebContent/VAADIN/themes/base/dragwrapper/dragwrapper.scss
@@ -110,7 +110,7 @@
 .v-ddwrapper-over-left:before,
 .v-ddwrapper-over-right:before {
 	display: block;
-	content: "";
+	
 	position: absolute;
 	width: 6px;
 	height: 6px;
diff --git a/WebContent/VAADIN/themes/base/layout/layout.scss b/WebContent/VAADIN/themes/base/layout/layout.scss
index 04df35872e..d4f636e6d6 100644
--- a/WebContent/VAADIN/themes/base/layout/layout.scss
+++ b/WebContent/VAADIN/themes/base/layout/layout.scss
@@ -54,7 +54,7 @@ TODO
 
 .v-vertical,
 .v-horizontal {
-	display: inline-block;
+	display: block;	
 }
 
 div.v-layout.v-horizontal.v-widget {
@@ -79,12 +79,12 @@ div.v-layout.v-horizontal.v-widget {
 
 /* Clear any floats inside the slot, to prevent unwanted collapsing */
 .v-vertical > .v-slot:after {
-	content: "";
 	display: inline-block;
 	clear: both;
 	width: 0;
 	height: 0;
 	overflow: hidden;
+	line-height:0;
 }
 
 .v-vertical > .v-slot,
diff --git a/WebContent/VAADIN/themes/base/panel/panel.scss b/WebContent/VAADIN/themes/base/panel/panel.scss
index 93d82cd615..202e75c226 100644
--- a/WebContent/VAADIN/themes/base/panel/panel.scss
+++ b/WebContent/VAADIN/themes/base/panel/panel.scss
@@ -21,6 +21,7 @@
 }
 .v-panel-caption span {
 	vertical-align: middle;
+	display: table-row;
 }
 .v-panel-caption {
 	white-space: nowrap;
diff --git a/WebContent/VAADIN/themes/base/select/select.scss b/WebContent/VAADIN/themes/base/select/select.scss
index d6ef6d3585..d2d9e8a663 100644
--- a/WebContent/VAADIN/themes/base/select/select.scss
+++ b/WebContent/VAADIN/themes/base/select/select.scss
@@ -98,6 +98,10 @@
 .v-filterselect-suggestmenu table {
 	border-collapse: collapse;
 	border: none;
+	vertical-align:top;
+}
+.v-filterselect-suggestmenu tr{
+    line-height:0;
 }
 .v-filterselect-suggestmenu .gwt-MenuItem {
 	white-space: nowrap;
diff --git a/WebContent/VAADIN/themes/base/table/table.scss b/WebContent/VAADIN/themes/base/table/table.scss
index d521b5ebae..fd3c0af0e1 100644
--- a/WebContent/VAADIN/themes/base/table/table.scss
+++ b/WebContent/VAADIN/themes/base/table/table.scss
@@ -267,7 +267,7 @@
 .v-table-row-drag-top .v-table-cell-content:first-child:before,
 .v-table-row-drag-bottom .v-table-cell-content:first-child:after {
 	display: block;
-	content: "";
+	
 	position: absolute;
 	width: 6px;
 	height: 6px;
diff --git a/WebContent/VAADIN/themes/base/tree/tree.scss b/WebContent/VAADIN/themes/base/tree/tree.scss
index 0319bbe994..2e34053ad5 100644
--- a/WebContent/VAADIN/themes/base/tree/tree.scss
+++ b/WebContent/VAADIN/themes/base/tree/tree.scss
@@ -58,7 +58,7 @@ div.v-tree-node-leaf {
 .v-tree .v-tree-node-drag-bottom:after,
 .v-tree .v-tree-node-caption-drag-center:after {
 	display: block;
-	content: "";
+	
 	position: absolute;
 	width: 6px;
 	height: 6px;
diff --git a/WebContent/VAADIN/themes/runo/panel/panel.scss b/WebContent/VAADIN/themes/runo/panel/panel.scss
index 5963f73434..3d6b00173b 100644
--- a/WebContent/VAADIN/themes/runo/panel/panel.scss
+++ b/WebContent/VAADIN/themes/runo/panel/panel.scss
@@ -38,7 +38,7 @@
 }
 .v-panel-deco:before {
 	display: block;
-	content: "";
+	
 	width: 9px;
 	height: 9px;
 	margin-left: -9px;
diff --git a/WebContent/VAADIN/themes/runo/tabsheet/tabsheet.scss b/WebContent/VAADIN/themes/runo/tabsheet/tabsheet.scss
index 683eb35f4c..ec6bdd5b0f 100644
--- a/WebContent/VAADIN/themes/runo/tabsheet/tabsheet.scss
+++ b/WebContent/VAADIN/themes/runo/tabsheet/tabsheet.scss
@@ -117,7 +117,7 @@
 }
 .v-tabsheet-deco:before {
 	display: block;
-	content: "";
+	
 	width: 9px;
 	height: 9px;
 	margin-left: -9px;
diff --git a/WebContent/VAADIN/vaadinBootstrap.js b/WebContent/VAADIN/vaadinBootstrap.js
index 36cf2ec8eb..96c1b0e014 100644
--- a/WebContent/VAADIN/vaadinBootstrap.js
+++ b/WebContent/VAADIN/vaadinBootstrap.js
@@ -106,7 +106,10 @@
 					url += "&rootId=" + rootId;
 				}
 
-				url += '&initialPath=' + encodeURIComponent(getConfig("initialPath"));
+				var initialPath = getConfig("initialPath");
+				if (initialPath === null) {
+					url += '&initialPath=' + encodeURIComponent(initialPath);
+				}
 				url += '&initialParams=' + encodeURIComponent(JSON.stringify(getConfig("initialParams")));
 				
 				url += '&' + vaadin.getBrowserDetailsParameters(appId); 
@@ -131,6 +134,8 @@
 							
 							// Try bootstrapping again, this time without fetching missing info
 							bootstrapApp(false);
+						} else if (r.status == 500) {
+							document.write(r.responseText);
 						} else {
 							log('Error', r.statusText);  
 						}