Merge remote branch 'origin/master' into layoutgraph

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

diff --cc WebContent/VAADIN/themes/base/paintable/paintable.css
index c42da19e4f75c34a5848ddb676cb16133b90aad8,36a3fe34554ef06dc6f4108e7ac9d64027f9db88..fbe72751132b897036dcc6fcb47c8db0b9ec1b97
--- 1/WebContent/VAADIN/themes/base/paintable/paintable.css
--- 2/WebContent/VAADIN/themes/base/paintable/paintable.css
+++ b/WebContent/VAADIN/themes/base/paintable/paintable.css
@@@ -1,6 -1,4 +1,6 @@@
- .v-paintable {
+ .v-connector {
 -      box-sizing: border-box;
 +      -webkit-box-sizing: border-box;
        -moz-box-sizing: border-box;
 -}
 +      box-sizing: border-box;
 +      text-align: left;
- }
++}

diff --cc src/com/vaadin/terminal/gwt/client/LayoutManager.java
index 22d52867143f2ea3a76468a3c4ab4cf58689ad2d,b182429902af5dfc64fe8b5c8c7536ddb95e3abc..a40a2e841f82475d02001899bf1e951433d40875
--- 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
@@@ -718,9 -718,9 +738,9 @@@ public class LayoutManager 
          }
      }
  
 -    private void stopMeasuringIfUnecessary(Element element) {
 +    private void stopMeasuringIfUnnecessary(Element element) {
          if (!needsMeasure(element)) {
-             measuredNonPaintableElements.remove(element);
+             measuredNonConnectorElements.remove(element);
              setMeasuredSize(element, null);
          }
      }

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

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

diff --cc src/com/vaadin/terminal/gwt/client/ui/HorizontalBoxLayoutConnector.java
index bdd856537bd30bbbae100dfe5d32f9bb70dde3c9,0000000000000000000000000000000000000000..20d9ca9d3036c6cfe8a7b1465de4c9208c663892
mode 100644,000000..100644
--- 1/src/com/vaadin/terminal/gwt/client/ui/HorizontalBoxLayoutConnector.java
--- /dev/null
+++ b/src/com/vaadin/terminal/gwt/client/ui/HorizontalBoxLayoutConnector.java
@@@ -1,26 -1,0 +1,26 @@@
- import com.vaadin.terminal.gwt.client.ui.Component.LoadStyle;
 +package com.vaadin.terminal.gwt.client.ui;
 +
 +import com.vaadin.terminal.gwt.client.ApplicationConnection;
 +import com.vaadin.terminal.gwt.client.UIDL;
- @Component(value = HorizontalLayout.class, loadStyle = LoadStyle.EAGER)
++import com.vaadin.terminal.gwt.client.ui.Connect.LoadStyle;
 +import com.vaadin.ui.HorizontalLayout;
 +
++@Connect(value = HorizontalLayout.class, loadStyle = LoadStyle.EAGER)
 +public class HorizontalBoxLayoutConnector extends AbstractBoxLayoutConnector {
 +
 +    @Override
 +    public void init() {
 +        super.init();
 +        getWidget().setVertical(false);
 +    }
 +
 +    @Override
 +    public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
 +        // TODO remove when Vaadin style name handling is improved so that it
 +        // won't override extra client side style names
 +        getWidget().setVertical(false);
 +        super.updateFromUIDL(uidl, client);
 +        getWidget().setVertical(false);
 +    }
 +
 +}

diff --cc src/com/vaadin/terminal/gwt/client/ui/VerticalBoxLayoutConnector.java
index 80100fc0c7712fa4f369276b56daa9f2e3a005cd,0000000000000000000000000000000000000000..369afb9e2f9c48baf4ecfd6b475c0ba3881f3e59
mode 100644,000000..100644
--- 1/src/com/vaadin/terminal/gwt/client/ui/VerticalBoxLayoutConnector.java
--- /dev/null
+++ b/src/com/vaadin/terminal/gwt/client/ui/VerticalBoxLayoutConnector.java
@@@ -1,26 -1,0 +1,26 @@@
- import com.vaadin.terminal.gwt.client.ui.Component.LoadStyle;
 +package com.vaadin.terminal.gwt.client.ui;
 +
 +import com.vaadin.terminal.gwt.client.ApplicationConnection;
 +import com.vaadin.terminal.gwt.client.UIDL;
- @Component(value = VerticalLayout.class, loadStyle = LoadStyle.EAGER)
++import com.vaadin.terminal.gwt.client.ui.Connect.LoadStyle;
 +import com.vaadin.ui.VerticalLayout;
 +
++@Connect(value = VerticalLayout.class, loadStyle = LoadStyle.EAGER)
 +public class VerticalBoxLayoutConnector extends AbstractBoxLayoutConnector {
 +
 +    @Override
 +    public void init() {
 +        super.init();
 +        getWidget().setVertical(true);
 +    }
 +
 +    @Override
 +    public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
 +        // TODO fix when Vaadin style name handling is improved so that it won't
 +        // override extra client side style names
 +        getWidget().setVertical(true);
 +        super.updateFromUIDL(uidl, client);
 +        getWidget().setVertical(true);
 +    }
 +
 +}