Merge remote-tracking branch 'origin/master' into layoutgraph

diff --cc src/com/vaadin/terminal/gwt/client/LayoutManager.java
index cc9b8ae68fc00b4cfbb74b400c5741c2743b5675,4338f1284a4fdbc0f02f38e4e27a7f5340c71e20..6039452ab4139653d7b19f5019314fc31d31e581
--- 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
@@@ -18,9 -18,7 +18,8 @@@ import com.google.gwt.user.client.Timer
  import com.vaadin.terminal.gwt.client.MeasuredSize.MeasureResult;
  import com.vaadin.terminal.gwt.client.ui.ManagedLayout;
  import com.vaadin.terminal.gwt.client.ui.PostLayoutListener;
 +import com.vaadin.terminal.gwt.client.ui.PreLayoutListener;
  import com.vaadin.terminal.gwt.client.ui.SimpleManagedLayout;
- import com.vaadin.terminal.gwt.client.ui.VNotification;
  import com.vaadin.terminal.gwt.client.ui.layout.ElementResizeEvent;
  import com.vaadin.terminal.gwt.client.ui.layout.ElementResizeListener;
  import com.vaadin.terminal.gwt.client.ui.layout.LayoutDependencyTree;