Merge commit '239aad'

Conflicts:
	WebContent/VAADIN/themes/base/panel/panel.css

diff --cc WebContent/VAADIN/themes/base/common/common.css
index 222ec5912f2dc423857811cf65b1d766db5618f1,f0b0f8e7be0cfcc07bf7b834eb91a4a45ff487a5..ccdd5190fca35562ba320d039105fcfa72ac06a8
--- 1/WebContent/VAADIN/themes/base/common/common.css
--- 2/WebContent/VAADIN/themes/base/common/common.css
+++ b/WebContent/VAADIN/themes/base/common/common.css
@@@ -29,15 -29,11 +29,14 @@@ div.v-app-loading 
  .v-view {
        height: 100%;
        width: 100%;
-       overflow: auto;
        /* avoid scrollbars with margins in root layout */
        outline: none;
 +      position: relative;
 +}
 +/* Prevent margin collapse */
 +.v-view.v-view-embedded {
        margin-top: -1px;
        border-top: 1px solid transparent;
 -      position: relative;
  }
  /**
   * Try to handle printing somehow. Reasonable printing support 

diff --cc WebContent/VAADIN/themes/base/panel/panel.css
index 489d6bc0151f571fdfbd86e0f24cf2ba44304b02,74d7b67a35251677048f10bf41b3842abbaa3f59..d5a991549012d1614e2136d3145da05c0f79c19c
--- 1/WebContent/VAADIN/themes/base/panel/panel.css
--- 2/WebContent/VAADIN/themes/base/panel/panel.css
+++ b/WebContent/VAADIN/themes/base/panel/panel.css
@@@ -29,16 -29,6 +29,15 @@@
        overflow: hidden;
  }
  .v-panel-content {
-       overflow: auto;
 +      -webkit-box-sizing: border-box;
 +      -moz-box-sizing: border-box;
 +      box-sizing: border-box;
 +}
 +.v-panel.v-has-width > .v-panel-content {
 +      width: 100%;
 +}
 +.v-panel.v-has-height > .v-panel-content {
 +      height: 100%;
  }
  .v-panel-deco {
  }