Merge branch 'master' into layoutgraph

diff --cc client/src/com/vaadin/client/ComponentLocator.java
index 4b47a96dca7810a32b6086807fa3d6a0da1c5dce,89e022c1795bd83dec40be075fb9f4182d38979d..017383e695e2db931f48d6c14c2002abfeb2c3e2
--- 1/client/src/com/vaadin/client/ComponentLocator.java
--- 2/client/src/com/vaadin/client/ComponentLocator.java
+++ b/client/src/com/vaadin/client/ComponentLocator.java
@@@ -23,14 -23,12 +23,14 @@@ import com.google.gwt.user.client.DOM
  import com.google.gwt.user.client.Element;
  import com.google.gwt.user.client.ui.HasWidgets;
  import com.google.gwt.user.client.ui.RootPanel;
 +import com.google.gwt.user.client.ui.SimplePanel;
  import com.google.gwt.user.client.ui.Widget;
  import com.vaadin.client.ui.SubPartAware;
- import com.vaadin.client.ui.UI.VUI;
  import com.vaadin.client.ui.gridlayout.VGridLayout;
 +import com.vaadin.client.ui.orderedlayout.VBoxLayout;
  import com.vaadin.client.ui.orderedlayout.VMeasuringOrderedLayout;
  import com.vaadin.client.ui.tabsheet.VTabsheetPanel;
+ import com.vaadin.client.ui.ui.VUI;
  import com.vaadin.client.ui.window.VWindow;
  import com.vaadin.client.ui.window.WindowConnector;
  import com.vaadin.shared.ComponentState;

diff --cc client/src/com/vaadin/client/ui/AbstractComponentConnector.java
Simple merge

diff --cc server/src/com/vaadin/ui/LoginForm.java
Simple merge