Merged master to layoutgraph

diff --cc WebContent/VAADIN/themes/base/absolutelayout/absolutelayout.css
Simple merge

diff --cc WebContent/VAADIN/themes/base/csslayout/csslayout.css
index 2713d621a22c3f0acf4fd727601b3dcf7fc25614,064edd28a4211514a20cff2c1d2b74b3da0a8042..40cec4889fa25b68b913591ba3985660a3d6853a
--- 1/WebContent/VAADIN/themes/base/csslayout/csslayout.css
--- 2/WebContent/VAADIN/themes/base/csslayout/csslayout.css
+++ b/WebContent/VAADIN/themes/base/csslayout/csslayout.css
@@@ -1,13 -1,9 +1,13 @@@
  .v-csslayout {
        overflow: hidden;
  }
 +/* More specific selector to override 'v-connector' */
 +div.v-csslayout {
 +      display: block;
 +}
  .v-csslayout-margin, .v-csslayout-container {
-       -moz-box-sizing: border-box;
        -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
        box-sizing: border-box;
  }
  .v-has-width > .v-csslayout-margin,

diff --cc src/com/vaadin/terminal/gwt/client/ComputedStyle.java
Simple merge

diff --cc src/com/vaadin/terminal/gwt/client/LayoutManager.java
index 55d3fbe27294c2bc898e1c471c873c7e3d0e6faf,9390c719fc919123acdb2284d0ddccd928a6be88..79a0030140a60932686393d1cca85d126534e391
--- 1/src/com/vaadin/terminal/gwt/client/LayoutManager.java
--- 2/src/com/vaadin/terminal/gwt/client/LayoutManager.java
+++ b/src/com/vaadin/terminal/gwt/client/LayoutManager.java
@@@ -655,14 -1002,19 +1014,27 @@@ public class LayoutManager 
          return getMeasuredSize(element, nullSize).getMarginLeft();
      }
  
 +    public int getMarginWidth(Element element) {
 +        return getMeasuredSize(element, nullSize).getMarginWidth();
 +    }
 +
 +    public int getMarginHeight(Element element) {
 +        return getMeasuredSize(element, nullSize).getMarginHeight();
 +    }
 +
+     /**
+      * Registers the outer height (including margins, borders and paddings) of a
+      * component. This can be used as an optimization by ManagedLayouts; by
+      * informing the LayoutManager about what size a component will have, the
+      * layout propagation can continue directly without first measuring the
+      * potentially resized elements.
+      * 
+      * @param component
+      *            the component for which the size is reported
+      * @param outerHeight
+      *            the new outer height (including margins, borders and paddings)
+      *            of the component in pixels
+      */
      public void reportOuterHeight(ComponentConnector component, int outerHeight) {
          MeasuredSize measuredSize = getMeasuredSize(component);
          if (isLayoutRunning()) {

diff --cc src/com/vaadin/terminal/gwt/client/ServerConnector.java
Simple merge