Merge branch 'master' into root-cleanup

Rename Root -> UI in root cleanup code

Conflicts:
	client/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
	server/src/com/vaadin/terminal/gwt/server/BootstrapHandler.java
	server/src/com/vaadin/ui/UI.java

1 files changed, 1 insertions, 1 deletions

diff --git a/server/src/com/vaadin/terminal/AbstractJavaScriptExtension.java b/server/src/com/vaadin/terminal/AbstractJavaScriptExtension.java
index aae71640aa..1def6df697 100644
--- a/server/src/com/vaadin/terminal/AbstractJavaScriptExtension.java
+++ b/server/src/com/vaadin/terminal/AbstractJavaScriptExtension.java
@@ -166,7 +166,7 @@ public abstract class AbstractJavaScriptExtension extends AbstractExtension {
     }
 
     @Override
-    public JavaScriptExtensionState getState() {
+    protected JavaScriptExtensionState getState() {
         return (JavaScriptExtensionState) super.getState();
     }
 }