Merge branch 'master' into root-cleanup

Conflicts:
	server/src/com/vaadin/terminal/DeploymentConfiguration.java
	server/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
	server/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
	server/src/com/vaadin/terminal/gwt/server/AbstractDeploymentConfiguration.java

1 files changed, 0 insertions, 25 deletions

diff --git a/src/com/vaadin/shared/communication/UidlValue.java b/src/com/vaadin/shared/communication/UidlValue.java
deleted file mode 100644
index 0314488ef3..0000000000
--- a/src/com/vaadin/shared/communication/UidlValue.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/* 
-@VaadinApache2LicenseForJavaFiles@
- */
-
-package com.vaadin.shared.communication;
-
-import java.io.Serializable;
-
-public class UidlValue implements Serializable {
-    private Object value;
-
-    public UidlValue(Object value) {
-        this.value = value;
-    }
-
-    public Object getValue() {
-        return value;
-    }
-
-    @Override
-    public String toString() {
-        return "" + value;
-    }
-
-}