Merge changes from origin/7.1

e77e73c Update copyright year to 2014

Conflicts:
	client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java
	client/src/com/vaadin/client/ApplicationConnection.java
	server/src/com/vaadin/data/util/converter/StringToNumberConverter.java
	shared/src/com/vaadin/shared/ui/ui/PageState.java
	shared/src/com/vaadin/shared/ui/window/WindowState.java
	theme-compiler/src/com/vaadin/sass/SassCompiler.java
	theme-compiler/src/com/vaadin/sass/internal/ScssStylesheet.java
	theme-compiler/src/com/vaadin/sass/internal/expression/ArithmeticExpressionEvaluator.java
	theme-compiler/src/com/vaadin/sass/internal/expression/BinaryExpression.java
	theme-compiler/src/com/vaadin/sass/internal/expression/BinaryOperator.java
	theme-compiler/src/com/vaadin/sass/internal/expression/exception/ArithmeticException.java
	theme-compiler/src/com/vaadin/sass/internal/expression/exception/IncompatibleUnitsException.java
	theme-compiler/src/com/vaadin/sass/internal/handler/SCSSDocumentHandler.java
	theme-compiler/src/com/vaadin/sass/internal/handler/SCSSDocumentHandlerImpl.java
	theme-compiler/src/com/vaadin/sass/internal/handler/SCSSErrorHandler.java
	theme-compiler/src/com/vaadin/sass/internal/parser/CharStream.java
	theme-compiler/src/com/vaadin/sass/internal/parser/Generic_CharStream.java
	theme-compiler/src/com/vaadin/sass/internal/parser/LexicalUnitImpl.java
	theme-compiler/src/com/vaadin/sass/internal/parser/LocatorImpl.java
	theme-compiler/src/com/vaadin/sass/internal/parser/MediaListImpl.java
	theme-compiler/src/com/vaadin/sass/internal/parser/ParseException.java
	theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java
	theme-compiler/src/com/vaadin/sass/internal/parser/ParserConstants.java
	theme-compiler/src/com/vaadin/sass/internal/parser/ParserTokenManager.java
	theme-compiler/src/com/vaadin/sass/internal/parser/SCSSLexicalUnit.java
	theme-compiler/src/com/vaadin/sass/internal/parser/SCSSParseException.java
	theme-compiler/src/com/vaadin/sass/internal/parser/SelectorListImpl.java
	theme-compiler/src/com/vaadin/sass/internal/parser/Selectors.java
	theme-compiler/src/com/vaadin/sass/internal/parser/ThrowedParseException.java
	theme-compiler/src/com/vaadin/sass/internal/parser/Token.java
	theme-compiler/src/com/vaadin/sass/internal/parser/TokenMgrError.java
	theme-compiler/src/com/vaadin/sass/internal/resolver/ClassloaderResolver.java
	theme-compiler/src/com/vaadin/sass/internal/resolver/FilesystemResolver.java
	theme-compiler/src/com/vaadin/sass/internal/resolver/ScssStylesheetResolver.java
	theme-compiler/src/com/vaadin/sass/internal/resolver/VaadinResolver.java
	theme-compiler/src/com/vaadin/sass/internal/selector/SelectorUtil.java
	theme-compiler/src/com/vaadin/sass/internal/tree/BlockNode.java
	theme-compiler/src/com/vaadin/sass/internal/tree/ExtendNode.java
	theme-compiler/src/com/vaadin/sass/internal/tree/ForNode.java
	theme-compiler/src/com/vaadin/sass/internal/tree/FunctionNode.java
	theme-compiler/src/com/vaadin/sass/internal/tree/ImportNode.java
	theme-compiler/src/com/vaadin/sass/internal/tree/KeyframesNode.java
	theme-compiler/src/com/vaadin/sass/internal/tree/ListContainsNode.java
	theme-compiler/src/com/vaadin/sass/internal/tree/ListModifyNode.java
	theme-compiler/src/com/vaadin/sass/internal/tree/ListRemoveNode.java
	theme-compiler/src/com/vaadin/sass/internal/tree/MediaNode.java
	theme-compiler/src/com/vaadin/sass/internal/tree/MicrosoftRuleNode.java
	theme-compiler/src/com/vaadin/sass/internal/tree/MixinDefNode.java
	theme-compiler/src/com/vaadin/sass/internal/tree/MixinNode.java
	theme-compiler/src/com/vaadin/sass/internal/tree/NestPropertiesNode.java
	theme-compiler/src/com/vaadin/sass/internal/tree/Node.java
	theme-compiler/src/com/vaadin/sass/internal/tree/RuleNode.java
	theme-compiler/src/com/vaadin/sass/internal/tree/SimpleNode.java
	theme-compiler/src/com/vaadin/sass/internal/tree/VariableNode.java
	theme-compiler/src/com/vaadin/sass/internal/tree/controldirective/EachDefNode.java
	theme-compiler/src/com/vaadin/sass/internal/tree/controldirective/IfElseDefNode.java
	theme-compiler/src/com/vaadin/sass/internal/tree/controldirective/IfNode.java
	theme-compiler/src/com/vaadin/sass/internal/util/ColorUtil.java
	theme-compiler/src/com/vaadin/sass/internal/util/DeepCopy.java
	theme-compiler/src/com/vaadin/sass/internal/util/FastByteArrayInputStream.java
	theme-compiler/src/com/vaadin/sass/internal/util/FastByteArrayOutputStream.java
	theme-compiler/src/com/vaadin/sass/internal/util/StringUtil.java
	theme-compiler/src/com/vaadin/sass/internal/visitor/BlockNodeHandler.java
	theme-compiler/src/com/vaadin/sass/internal/visitor/EachNodeHandler.java
	theme-compiler/src/com/vaadin/sass/internal/visitor/ExtendNodeHandler.java
	theme-compiler/src/com/vaadin/sass/internal/visitor/IfElseNodeHandler.java
	theme-compiler/src/com/vaadin/sass/internal/visitor/ImportNodeHandler.java
	theme-compiler/src/com/vaadin/sass/internal/visitor/MixinNodeHandler.java
	theme-compiler/src/com/vaadin/sass/internal/visitor/NestedNodeHandler.java
	theme-compiler/src/com/vaadin/sass/internal/visitor/VariableNodeHandler.java
	theme-compiler/tests/src/com/vaadin/sass/AbstractTestBase.java
	theme-compiler/tests/src/com/vaadin/sass/internal/expression/ArithmeticExpressionEvaluatorTest.java
	theme-compiler/tests/src/com/vaadin/sass/parser/ParserTest.java
	theme-compiler/tests/src/com/vaadin/sass/resolvers/VaadinResolverTest.java
	theme-compiler/tests/src/com/vaadin/sass/testcases/css/Interpolation.java
	theme-compiler/tests/src/com/vaadin/sass/testcases/css/Selectors.java
	theme-compiler/tests/src/com/vaadin/sass/testcases/scss/AbstractDirectoryScanningSassTests.java
	theme-compiler/tests/src/com/vaadin/sass/testcases/scss/AutomaticSassTests.java
	theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Comments.java
	theme-compiler/tests/src/com/vaadin/sass/testcases/scss/ControlDirectives.java
	theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Extends.java
	theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Functions.java
	theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Imports.java
	theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Mixins.java
	theme-compiler/tests/src/com/vaadin/sass/testcases/scss/NestedProperties.java
	theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Nesting.java
	theme-compiler/tests/src/com/vaadin/sass/testcases/scss/ParentImports.java
	theme-compiler/tests/src/com/vaadin/sass/testcases/scss/ParentSelector.java
	theme-compiler/tests/src/com/vaadin/sass/testcases/scss/SassLangTests.java
	theme-compiler/tests/src/com/vaadin/sass/testcases/scss/SassLangTestsBroken.java
	theme-compiler/tests/src/com/vaadin/sass/testcases/scss/SassTestRunner.java
	theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Variables.java
	theme-compiler/tests/src/com/vaadin/sass/tree/ImportNodeTest.java
	uitest/src/com/vaadin/tests/push/BasicPushTest.java
	uitest/src/com/vaadin/tests/push/PushConfigurationTest.java
	uitest/src/com/vaadin/tests/push/PushReconnectTest.java

Change-Id: Ic08c4f9aecd4c684ce74408de4e0b0d0ff617273

42 files changed, 52 insertions, 52 deletions

diff --git a/uitest/src/com/vaadin/tests/push/BarInUIDL.java b/uitest/src/com/vaadin/tests/push/BarInUIDL.java
index bc05f7c306..b380edcb75 100644
--- a/uitest/src/com/vaadin/tests/push/BarInUIDL.java
+++ b/uitest/src/com/vaadin/tests/push/BarInUIDL.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 Vaadin Ltd.
+ * Copyright 2000-2014 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
diff --git a/uitest/src/com/vaadin/tests/push/BarInUIDLTest.java b/uitest/src/com/vaadin/tests/push/BarInUIDLTest.java
index cd716dcaa3..4013494c49 100644
--- a/uitest/src/com/vaadin/tests/push/BarInUIDLTest.java
+++ b/uitest/src/com/vaadin/tests/push/BarInUIDLTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 Vaadin Ltd.
+ * Copyright 2000-2014 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
@@ -44,4 +44,4 @@ public class BarInUIDLTest extends MultiBrowserTest {
     private WebElement getButton() {
         return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VButton[0]");
     }
-}
\ No newline at end of file
+}
diff --git a/uitest/src/com/vaadin/tests/push/BasicPush.java b/uitest/src/com/vaadin/tests/push/BasicPush.java
index 8e8f418c5f..ffc5395c2c 100644
--- a/uitest/src/com/vaadin/tests/push/BasicPush.java
+++ b/uitest/src/com/vaadin/tests/push/BasicPush.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 Vaadin Ltd.
+ * Copyright 2000-2014 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
diff --git a/uitest/src/com/vaadin/tests/push/BasicPushLongPollingTest.java b/uitest/src/com/vaadin/tests/push/BasicPushLongPollingTest.java
index b526a11d38..b404747c80 100644
--- a/uitest/src/com/vaadin/tests/push/BasicPushLongPollingTest.java
+++ b/uitest/src/com/vaadin/tests/push/BasicPushLongPollingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 Vaadin Ltd.
+ * Copyright 2000-2014 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
@@ -16,4 +16,4 @@
 package com.vaadin.tests.push;
 
 public class BasicPushLongPollingTest extends BasicPushTest {
-}
\ No newline at end of file
+}
diff --git a/uitest/src/com/vaadin/tests/push/BasicPushStreaming.java b/uitest/src/com/vaadin/tests/push/BasicPushStreaming.java
index f9dc78dd43..c906c5f6e1 100644
--- a/uitest/src/com/vaadin/tests/push/BasicPushStreaming.java
+++ b/uitest/src/com/vaadin/tests/push/BasicPushStreaming.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 Vaadin Ltd.
+ * Copyright 2000-2014 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
diff --git a/uitest/src/com/vaadin/tests/push/BasicPushStreamingTest.java b/uitest/src/com/vaadin/tests/push/BasicPushStreamingTest.java
index 67730f72c8..ceb0b28c76 100644
--- a/uitest/src/com/vaadin/tests/push/BasicPushStreamingTest.java
+++ b/uitest/src/com/vaadin/tests/push/BasicPushStreamingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 Vaadin Ltd.
+ * Copyright 2000-2014 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
@@ -16,4 +16,4 @@
 package com.vaadin.tests.push;
 
 public class BasicPushStreamingTest extends BasicPushTest {
-}
\ No newline at end of file
+}
diff --git a/uitest/src/com/vaadin/tests/push/BasicPushTest.java b/uitest/src/com/vaadin/tests/push/BasicPushTest.java
index 7f4492aeba..fd34a1f192 100644
--- a/uitest/src/com/vaadin/tests/push/BasicPushTest.java
+++ b/uitest/src/com/vaadin/tests/push/BasicPushTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 Vaadin Ltd.
+ * Copyright 2000-2014 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
@@ -104,4 +104,4 @@ public abstract class BasicPushTest extends MultiBrowserTest {
         }, 10);
     }
 
-}
\ No newline at end of file
+}
diff --git a/uitest/src/com/vaadin/tests/push/BasicPushWebsocket.java b/uitest/src/com/vaadin/tests/push/BasicPushWebsocket.java
index 465caf0165..84c0b19ce8 100644
--- a/uitest/src/com/vaadin/tests/push/BasicPushWebsocket.java
+++ b/uitest/src/com/vaadin/tests/push/BasicPushWebsocket.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 Vaadin Ltd.
+ * Copyright 2000-2014 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
diff --git a/uitest/src/com/vaadin/tests/push/BasicPushWebsocketTest.java b/uitest/src/com/vaadin/tests/push/BasicPushWebsocketTest.java
index dd0a147d99..093ee348b8 100644
--- a/uitest/src/com/vaadin/tests/push/BasicPushWebsocketTest.java
+++ b/uitest/src/com/vaadin/tests/push/BasicPushWebsocketTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 Vaadin Ltd.
+ * Copyright 2000-2014 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
@@ -26,4 +26,4 @@ public class BasicPushWebsocketTest extends BasicPushTest {
     public List<DesiredCapabilities> getBrowsersToTest() {
         return WebsocketTest.getWebsocketBrowsers();
     }
-}
\ No newline at end of file
+}
diff --git a/uitest/src/com/vaadin/tests/push/EnableDisablePushTest.java b/uitest/src/com/vaadin/tests/push/EnableDisablePushTest.java
index 2e14f9459b..03b34655a1 100644
--- a/uitest/src/com/vaadin/tests/push/EnableDisablePushTest.java
+++ b/uitest/src/com/vaadin/tests/push/EnableDisablePushTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 Vaadin Ltd.
+ * Copyright 2000-2014 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
@@ -71,4 +71,4 @@ public class EnableDisablePushTest extends MultiBrowserTest {
         return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[4]/VButton[0]");
     }
 
-}
\ No newline at end of file
+}
diff --git a/uitest/src/com/vaadin/tests/push/ExtremelyLongPushTime.java b/uitest/src/com/vaadin/tests/push/ExtremelyLongPushTime.java
index d90394d3b5..815b85ecc4 100644
--- a/uitest/src/com/vaadin/tests/push/ExtremelyLongPushTime.java
+++ b/uitest/src/com/vaadin/tests/push/ExtremelyLongPushTime.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 Vaadin Ltd.
+ * Copyright 2000-2014 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
diff --git a/uitest/src/com/vaadin/tests/push/ExtremelyLongPushTimeLongPollingTest.java b/uitest/src/com/vaadin/tests/push/ExtremelyLongPushTimeLongPollingTest.java
index eb28634dfa..13f601da7a 100644
--- a/uitest/src/com/vaadin/tests/push/ExtremelyLongPushTimeLongPollingTest.java
+++ b/uitest/src/com/vaadin/tests/push/ExtremelyLongPushTimeLongPollingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 Vaadin Ltd.
+ * Copyright 2000-2014 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
diff --git a/uitest/src/com/vaadin/tests/push/ExtremelyLongPushTimeStreaming.java b/uitest/src/com/vaadin/tests/push/ExtremelyLongPushTimeStreaming.java
index 3e9582740d..04a9c68e32 100644
--- a/uitest/src/com/vaadin/tests/push/ExtremelyLongPushTimeStreaming.java
+++ b/uitest/src/com/vaadin/tests/push/ExtremelyLongPushTimeStreaming.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 Vaadin Ltd.
+ * Copyright 2000-2014 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
diff --git a/uitest/src/com/vaadin/tests/push/ExtremelyLongPushTimeStreamingTest.java b/uitest/src/com/vaadin/tests/push/ExtremelyLongPushTimeStreamingTest.java
index 17837cb2d3..4af6179e81 100644
--- a/uitest/src/com/vaadin/tests/push/ExtremelyLongPushTimeStreamingTest.java
+++ b/uitest/src/com/vaadin/tests/push/ExtremelyLongPushTimeStreamingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 Vaadin Ltd.
+ * Copyright 2000-2014 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
diff --git a/uitest/src/com/vaadin/tests/push/ExtremelyLongPushTimeTest.java b/uitest/src/com/vaadin/tests/push/ExtremelyLongPushTimeTest.java
index a1ce4b9d8f..06ddc07abb 100644
--- a/uitest/src/com/vaadin/tests/push/ExtremelyLongPushTimeTest.java
+++ b/uitest/src/com/vaadin/tests/push/ExtremelyLongPushTimeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 Vaadin Ltd.
+ * Copyright 2000-2014 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
diff --git a/uitest/src/com/vaadin/tests/push/ExtremelyLongPushTimeWebsocket.java b/uitest/src/com/vaadin/tests/push/ExtremelyLongPushTimeWebsocket.java
index 8346d49234..f73e7b728c 100644
--- a/uitest/src/com/vaadin/tests/push/ExtremelyLongPushTimeWebsocket.java
+++ b/uitest/src/com/vaadin/tests/push/ExtremelyLongPushTimeWebsocket.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 Vaadin Ltd.
+ * Copyright 2000-2014 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
diff --git a/uitest/src/com/vaadin/tests/push/ExtremelyLongPushTimeWebsocketTest.java b/uitest/src/com/vaadin/tests/push/ExtremelyLongPushTimeWebsocketTest.java
index 23d773c7da..c0b188bbab 100644
--- a/uitest/src/com/vaadin/tests/push/ExtremelyLongPushTimeWebsocketTest.java
+++ b/uitest/src/com/vaadin/tests/push/ExtremelyLongPushTimeWebsocketTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 Vaadin Ltd.
+ * Copyright 2000-2014 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
diff --git a/uitest/src/com/vaadin/tests/push/IdlePushChannelStreamingTest.java b/uitest/src/com/vaadin/tests/push/IdlePushChannelStreamingTest.java
index f9a0a722e5..c5a909385f 100644
--- a/uitest/src/com/vaadin/tests/push/IdlePushChannelStreamingTest.java
+++ b/uitest/src/com/vaadin/tests/push/IdlePushChannelStreamingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 Vaadin Ltd.
+ * Copyright 2000-2014 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
diff --git a/uitest/src/com/vaadin/tests/push/IdlePushChannelTest.java b/uitest/src/com/vaadin/tests/push/IdlePushChannelTest.java
index 95a916f72d..4b142500f7 100644
--- a/uitest/src/com/vaadin/tests/push/IdlePushChannelTest.java
+++ b/uitest/src/com/vaadin/tests/push/IdlePushChannelTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 Vaadin Ltd.
+ * Copyright 2000-2014 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
diff --git a/uitest/src/com/vaadin/tests/push/IdlePushChannelWebsocketTest.java b/uitest/src/com/vaadin/tests/push/IdlePushChannelWebsocketTest.java
index 3fd9c616fb..644dbd7580 100644
--- a/uitest/src/com/vaadin/tests/push/IdlePushChannelWebsocketTest.java
+++ b/uitest/src/com/vaadin/tests/push/IdlePushChannelWebsocketTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 Vaadin Ltd.
+ * Copyright 2000-2014 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
diff --git a/uitest/src/com/vaadin/tests/push/PushConfiguration.java b/uitest/src/com/vaadin/tests/push/PushConfiguration.java
index a7ba4e43ba..5e56a5f361 100644
--- a/uitest/src/com/vaadin/tests/push/PushConfiguration.java
+++ b/uitest/src/com/vaadin/tests/push/PushConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 Vaadin Ltd.
+ * Copyright 2000-2014 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
diff --git a/uitest/src/com/vaadin/tests/push/PushConfigurationTest.java b/uitest/src/com/vaadin/tests/push/PushConfigurationTest.java
index 20399fc67e..bb5b420259 100644
--- a/uitest/src/com/vaadin/tests/push/PushConfigurationTest.java
+++ b/uitest/src/com/vaadin/tests/push/PushConfigurationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 Vaadin Ltd.
+ * Copyright 2000-2014 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
@@ -84,4 +84,4 @@ abstract class PushConfigurationTest extends MultiBrowserTest {
             }
         });
     }
-}
\ No newline at end of file
+}
diff --git a/uitest/src/com/vaadin/tests/push/PushConfigurator.java b/uitest/src/com/vaadin/tests/push/PushConfigurator.java
index 6dbe130b73..5a45ab7206 100644
--- a/uitest/src/com/vaadin/tests/push/PushConfigurator.java
+++ b/uitest/src/com/vaadin/tests/push/PushConfigurator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 Vaadin Ltd.
+ * Copyright 2000-2014 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
diff --git a/uitest/src/com/vaadin/tests/push/PushErrorHandlingTest.java b/uitest/src/com/vaadin/tests/push/PushErrorHandlingTest.java
index 8dbf91f9ee..c31b167586 100644
--- a/uitest/src/com/vaadin/tests/push/PushErrorHandlingTest.java
+++ b/uitest/src/com/vaadin/tests/push/PushErrorHandlingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 Vaadin Ltd.
+ * Copyright 2000-2014 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
diff --git a/uitest/src/com/vaadin/tests/push/PushFromInit.java b/uitest/src/com/vaadin/tests/push/PushFromInit.java
index 0afaa866f7..63af3d9ec7 100644
--- a/uitest/src/com/vaadin/tests/push/PushFromInit.java
+++ b/uitest/src/com/vaadin/tests/push/PushFromInit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 Vaadin Ltd.
+ * Copyright 2000-2014 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
diff --git a/uitest/src/com/vaadin/tests/push/PushFromInitTest.java b/uitest/src/com/vaadin/tests/push/PushFromInitTest.java
index 15453fc054..a285d91e92 100644
--- a/uitest/src/com/vaadin/tests/push/PushFromInitTest.java
+++ b/uitest/src/com/vaadin/tests/push/PushFromInitTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 Vaadin Ltd.
+ * Copyright 2000-2014 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
@@ -37,4 +37,4 @@ public class PushFromInitTest extends MultiBrowserTest {
         });
 
     }
-}
\ No newline at end of file
+}
diff --git a/uitest/src/com/vaadin/tests/push/PushLargeData.java b/uitest/src/com/vaadin/tests/push/PushLargeData.java
index f43348b5eb..f9625b80be 100644
--- a/uitest/src/com/vaadin/tests/push/PushLargeData.java
+++ b/uitest/src/com/vaadin/tests/push/PushLargeData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 Vaadin Ltd.
+ * Copyright 2000-2014 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
diff --git a/uitest/src/com/vaadin/tests/push/PushLargeDataLongPolling.java b/uitest/src/com/vaadin/tests/push/PushLargeDataLongPolling.java
index 52a647115a..c2fdb5ae95 100644
--- a/uitest/src/com/vaadin/tests/push/PushLargeDataLongPolling.java
+++ b/uitest/src/com/vaadin/tests/push/PushLargeDataLongPolling.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 Vaadin Ltd.
+ * Copyright 2000-2014 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
diff --git a/uitest/src/com/vaadin/tests/push/PushLargeDataStreaming.java b/uitest/src/com/vaadin/tests/push/PushLargeDataStreaming.java
index 7706aa90c6..ef300ab222 100644
--- a/uitest/src/com/vaadin/tests/push/PushLargeDataStreaming.java
+++ b/uitest/src/com/vaadin/tests/push/PushLargeDataStreaming.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 Vaadin Ltd.
+ * Copyright 2000-2014 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
diff --git a/uitest/src/com/vaadin/tests/push/PushLargeDataStreamingTest.java b/uitest/src/com/vaadin/tests/push/PushLargeDataStreamingTest.java
index 14dc5208ef..26fa512ab2 100644
--- a/uitest/src/com/vaadin/tests/push/PushLargeDataStreamingTest.java
+++ b/uitest/src/com/vaadin/tests/push/PushLargeDataStreamingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 Vaadin Ltd.
+ * Copyright 2000-2014 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
diff --git a/uitest/src/com/vaadin/tests/push/PushLargeDataWebsocket.java b/uitest/src/com/vaadin/tests/push/PushLargeDataWebsocket.java
index 4115a825d1..a893d7f1ef 100644
--- a/uitest/src/com/vaadin/tests/push/PushLargeDataWebsocket.java
+++ b/uitest/src/com/vaadin/tests/push/PushLargeDataWebsocket.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 Vaadin Ltd.
+ * Copyright 2000-2014 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
diff --git a/uitest/src/com/vaadin/tests/push/PushLargeDataWebsocketTest.java b/uitest/src/com/vaadin/tests/push/PushLargeDataWebsocketTest.java
index cc8668a729..57fb8c33b0 100644
--- a/uitest/src/com/vaadin/tests/push/PushLargeDataWebsocketTest.java
+++ b/uitest/src/com/vaadin/tests/push/PushLargeDataWebsocketTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 Vaadin Ltd.
+ * Copyright 2000-2014 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
diff --git a/uitest/src/com/vaadin/tests/push/ReconnectLongPollingTest.java b/uitest/src/com/vaadin/tests/push/ReconnectLongPollingTest.java
index 4ea0c7daf4..8a4593d70d 100644
--- a/uitest/src/com/vaadin/tests/push/ReconnectLongPollingTest.java
+++ b/uitest/src/com/vaadin/tests/push/ReconnectLongPollingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 Vaadin Ltd.
+ * Copyright 2000-2014 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
diff --git a/uitest/src/com/vaadin/tests/push/ReconnectStreamingTest.java b/uitest/src/com/vaadin/tests/push/ReconnectStreamingTest.java
index 4e2143f9e0..fe63764e78 100755
--- a/uitest/src/com/vaadin/tests/push/ReconnectStreamingTest.java
+++ b/uitest/src/com/vaadin/tests/push/ReconnectStreamingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 Vaadin Ltd.
+ * Copyright 2000-2014 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
diff --git a/uitest/src/com/vaadin/tests/push/ReconnectWebsocketTest.java b/uitest/src/com/vaadin/tests/push/ReconnectWebsocketTest.java
index 57fe0a040d..efaf5d493e 100644
--- a/uitest/src/com/vaadin/tests/push/ReconnectWebsocketTest.java
+++ b/uitest/src/com/vaadin/tests/push/ReconnectWebsocketTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 Vaadin Ltd.
+ * Copyright 2000-2014 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
diff --git a/uitest/src/com/vaadin/tests/push/RoundTripTest.java b/uitest/src/com/vaadin/tests/push/RoundTripTest.java
index ee0bf6dcb1..4e192db7f8 100644
--- a/uitest/src/com/vaadin/tests/push/RoundTripTest.java
+++ b/uitest/src/com/vaadin/tests/push/RoundTripTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 Vaadin Ltd.
+ * Copyright 2000-2014 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
diff --git a/uitest/src/com/vaadin/tests/push/StreamingReconnectWhilePushing.java b/uitest/src/com/vaadin/tests/push/StreamingReconnectWhilePushing.java
index 5a3460a290..74d089374c 100644
--- a/uitest/src/com/vaadin/tests/push/StreamingReconnectWhilePushing.java
+++ b/uitest/src/com/vaadin/tests/push/StreamingReconnectWhilePushing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 Vaadin Ltd.
+ * Copyright 2000-2014 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
diff --git a/uitest/src/com/vaadin/tests/push/TablePushStreaming.java b/uitest/src/com/vaadin/tests/push/TablePushStreaming.java
index de824eef3a..04aad63813 100644
--- a/uitest/src/com/vaadin/tests/push/TablePushStreaming.java
+++ b/uitest/src/com/vaadin/tests/push/TablePushStreaming.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 Vaadin Ltd.
+ * Copyright 2000-2014 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
diff --git a/uitest/src/com/vaadin/tests/push/TogglePush.java b/uitest/src/com/vaadin/tests/push/TogglePush.java
index 6ec8903d65..e662545134 100644
--- a/uitest/src/com/vaadin/tests/push/TogglePush.java
+++ b/uitest/src/com/vaadin/tests/push/TogglePush.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 Vaadin Ltd.
+ * Copyright 2000-2014 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
diff --git a/uitest/src/com/vaadin/tests/push/TogglePushTest.java b/uitest/src/com/vaadin/tests/push/TogglePushTest.java
index 49110c79dc..3ca12fdd84 100644
--- a/uitest/src/com/vaadin/tests/push/TogglePushTest.java
+++ b/uitest/src/com/vaadin/tests/push/TogglePushTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 Vaadin Ltd.
+ * Copyright 2000-2014 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
@@ -111,4 +111,4 @@ public class TogglePushTest extends MultiBrowserTest {
                 .getText();
     }
 
-}
\ No newline at end of file
+}
diff --git a/uitest/src/com/vaadin/tests/push/TrackMessageSizeUI.java b/uitest/src/com/vaadin/tests/push/TrackMessageSizeUI.java
index 23702564f9..6e2784f21d 100644
--- a/uitest/src/com/vaadin/tests/push/TrackMessageSizeUI.java
+++ b/uitest/src/com/vaadin/tests/push/TrackMessageSizeUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 Vaadin Ltd.
+ * Copyright 2000-2014 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
diff --git a/uitest/src/com/vaadin/tests/push/TrackMessageSizeUITest.java b/uitest/src/com/vaadin/tests/push/TrackMessageSizeUITest.java
index 4aab0f867a..b4af11b864 100644
--- a/uitest/src/com/vaadin/tests/push/TrackMessageSizeUITest.java
+++ b/uitest/src/com/vaadin/tests/push/TrackMessageSizeUITest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 Vaadin Ltd.
+ * Copyright 2000-2014 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
@@ -29,4 +29,4 @@ public class TrackMessageSizeUITest extends MultiBrowserTest {
         Assert.assertEquals("1. All tests run", vaadinElementById("Log_row_0")
                 .getText());
     }
-}
\ No newline at end of file
+}