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

40 files changed, 41 insertions, 41 deletions

diff --git a/server/tests/src/ClassInDefaultPackage.java b/server/tests/src/ClassInDefaultPackage.java
index 1eb8bc4df5..52dc87e0e2 100644
--- a/server/tests/src/ClassInDefaultPackage.java
+++ b/server/tests/src/ClassInDefaultPackage.java
@@ -1,7 +1,7 @@
 import org.junit.Ignore;
 
 /*
- * 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/server/tests/src/com/vaadin/data/DefaultFieldGroupFieldFactoryTest.java b/server/tests/src/com/vaadin/data/DefaultFieldGroupFieldFactoryTest.java
index b319c13e4e..cc1de6560f 100644
--- a/server/tests/src/com/vaadin/data/DefaultFieldGroupFieldFactoryTest.java
+++ b/server/tests/src/com/vaadin/data/DefaultFieldGroupFieldFactoryTest.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/server/tests/src/com/vaadin/data/fieldgroup/FieldGroupDate.java b/server/tests/src/com/vaadin/data/fieldgroup/FieldGroupDate.java
index e11b6e50f8..951fc20c42 100644
--- a/server/tests/src/com/vaadin/data/fieldgroup/FieldGroupDate.java
+++ b/server/tests/src/com/vaadin/data/fieldgroup/FieldGroupDate.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/server/tests/src/com/vaadin/data/util/filter/LikeFilterTest.java b/server/tests/src/com/vaadin/data/util/filter/LikeFilterTest.java
index 15ad85e10d..b0c96b6f9c 100644
--- a/server/tests/src/com/vaadin/data/util/filter/LikeFilterTest.java
+++ b/server/tests/src/com/vaadin/data/util/filter/LikeFilterTest.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/server/tests/src/com/vaadin/data/util/sqlcontainer/SQLTestsConstants.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/SQLTestsConstants.java
index 1e96d59ed5..e03e970048 100755
--- a/server/tests/src/com/vaadin/data/util/sqlcontainer/SQLTestsConstants.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/SQLTestsConstants.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
@@ -151,4 +151,4 @@ public class SQLTestsConstants {
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/server/tests/src/com/vaadin/data/util/sqlcontainer/filters/CompareTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/filters/CompareTest.java
index c8faa71e66..252acd81fc 100644
--- a/server/tests/src/com/vaadin/data/util/sqlcontainer/filters/CompareTest.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/filters/CompareTest.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/server/tests/src/com/vaadin/data/util/sqlcontainer/query/TableQueryTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/query/TableQueryTest.java
index c275cd4363..f009fc505e 100644
--- a/server/tests/src/com/vaadin/data/util/sqlcontainer/query/TableQueryTest.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/query/TableQueryTest.java
@@ -734,4 +734,4 @@ public class TableQueryTest {
             statement.execute(SQLTestsConstants.dropSchema);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/server/tests/src/com/vaadin/server/JSONSerializerTest.java b/server/tests/src/com/vaadin/server/JSONSerializerTest.java
index 81fd997c4a..8c1967acb3 100644
--- a/server/tests/src/com/vaadin/server/JSONSerializerTest.java
+++ b/server/tests/src/com/vaadin/server/JSONSerializerTest.java
@@ -1,7 +1,7 @@
 package com.vaadin.server;
 
 /*
- * 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/server/tests/src/com/vaadin/server/MockServletConfig.java b/server/tests/src/com/vaadin/server/MockServletConfig.java
index cd1201c249..d9d0e4d773 100644
--- a/server/tests/src/com/vaadin/server/MockServletConfig.java
+++ b/server/tests/src/com/vaadin/server/MockServletConfig.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/server/tests/src/com/vaadin/server/MockServletContext.java b/server/tests/src/com/vaadin/server/MockServletContext.java
index 40d79190f6..031c83ae90 100644
--- a/server/tests/src/com/vaadin/server/MockServletContext.java
+++ b/server/tests/src/com/vaadin/server/MockServletContext.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/server/tests/src/com/vaadin/server/MockVaadinSession.java b/server/tests/src/com/vaadin/server/MockVaadinSession.java
index 1fb53cd368..660767e0d4 100644
--- a/server/tests/src/com/vaadin/server/MockVaadinSession.java
+++ b/server/tests/src/com/vaadin/server/MockVaadinSession.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/server/tests/src/com/vaadin/server/VaadinPortletServiceTests.java b/server/tests/src/com/vaadin/server/VaadinPortletServiceTests.java
index 62befdc516..898d957e7b 100644
--- a/server/tests/src/com/vaadin/server/VaadinPortletServiceTests.java
+++ b/server/tests/src/com/vaadin/server/VaadinPortletServiceTests.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/server/tests/src/com/vaadin/server/VaadinServletConfigurationTest.java b/server/tests/src/com/vaadin/server/VaadinServletConfigurationTest.java
index 58b44dc3db..a5c683a119 100644
--- a/server/tests/src/com/vaadin/server/VaadinServletConfigurationTest.java
+++ b/server/tests/src/com/vaadin/server/VaadinServletConfigurationTest.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/server/tests/src/com/vaadin/server/VaadinSessionTest.java b/server/tests/src/com/vaadin/server/VaadinSessionTest.java
index edc78ba8d7..d39da211f4 100644
--- a/server/tests/src/com/vaadin/server/VaadinSessionTest.java
+++ b/server/tests/src/com/vaadin/server/VaadinSessionTest.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/server/tests/src/com/vaadin/tests/data/converter/ConverterFactory.java b/server/tests/src/com/vaadin/tests/data/converter/ConverterFactory.java
index 306e2f0405..32c9dc6604 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/ConverterFactory.java
+++ b/server/tests/src/com/vaadin/tests/data/converter/ConverterFactory.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/server/tests/src/com/vaadin/tests/data/converter/TestAnyEnumToStringConverter.java b/server/tests/src/com/vaadin/tests/data/converter/TestAnyEnumToStringConverter.java
index e21382069f..64b06f651e 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/TestAnyEnumToStringConverter.java
+++ b/server/tests/src/com/vaadin/tests/data/converter/TestAnyEnumToStringConverter.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/server/tests/src/com/vaadin/tests/data/converter/TestSpecificEnumToStringConverter.java b/server/tests/src/com/vaadin/tests/data/converter/TestSpecificEnumToStringConverter.java
index 8ce7b8eab8..75c742775f 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/TestSpecificEnumToStringConverter.java
+++ b/server/tests/src/com/vaadin/tests/data/converter/TestSpecificEnumToStringConverter.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/server/tests/src/com/vaadin/tests/event/EventRouterTest.java b/server/tests/src/com/vaadin/tests/event/EventRouterTest.java
index dbbeaf778e..aeb460c49e 100644
--- a/server/tests/src/com/vaadin/tests/event/EventRouterTest.java
+++ b/server/tests/src/com/vaadin/tests/event/EventRouterTest.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/server/tests/src/com/vaadin/tests/server/TestAssertionsEnabled.java b/server/tests/src/com/vaadin/tests/server/TestAssertionsEnabled.java
index f94cff391f..7e120cb9dd 100644
--- a/server/tests/src/com/vaadin/tests/server/TestAssertionsEnabled.java
+++ b/server/tests/src/com/vaadin/tests/server/TestAssertionsEnabled.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/server/tests/src/com/vaadin/tests/server/TestClientMethodSerialization.java b/server/tests/src/com/vaadin/tests/server/TestClientMethodSerialization.java
index 1e0210dc63..41b71a37fa 100644
--- a/server/tests/src/com/vaadin/tests/server/TestClientMethodSerialization.java
+++ b/server/tests/src/com/vaadin/tests/server/TestClientMethodSerialization.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/server/tests/src/com/vaadin/tests/server/TestSerialization.java b/server/tests/src/com/vaadin/tests/server/TestSerialization.java
index a52821a919..3c18035dab 100644
--- a/server/tests/src/com/vaadin/tests/server/TestSerialization.java
+++ b/server/tests/src/com/vaadin/tests/server/TestSerialization.java
@@ -136,4 +136,4 @@ public class TestSerialization extends TestCase {
             return dummyGetter;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/server/tests/src/com/vaadin/tests/server/component/ComponentSizeParseTest.java b/server/tests/src/com/vaadin/tests/server/component/ComponentSizeParseTest.java
index 11c0d10998..2083d1f473 100644
--- a/server/tests/src/com/vaadin/tests/server/component/ComponentSizeParseTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/ComponentSizeParseTest.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/server/tests/src/com/vaadin/tests/server/component/calendar/CalendarBasics.java b/server/tests/src/com/vaadin/tests/server/component/calendar/CalendarBasics.java
index 5926cfa1ca..ab2bc7c8c0 100644
--- a/server/tests/src/com/vaadin/tests/server/component/calendar/CalendarBasics.java
+++ b/server/tests/src/com/vaadin/tests/server/component/calendar/CalendarBasics.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/server/tests/src/com/vaadin/tests/server/component/calendar/ContainerDataSource.java b/server/tests/src/com/vaadin/tests/server/component/calendar/ContainerDataSource.java
index d5b0d5d9c8..030abc0eb2 100644
--- a/server/tests/src/com/vaadin/tests/server/component/calendar/ContainerDataSource.java
+++ b/server/tests/src/com/vaadin/tests/server/component/calendar/ContainerDataSource.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/server/tests/src/com/vaadin/tests/server/component/csslayout/CssLayoutListeners.java b/server/tests/src/com/vaadin/tests/server/component/csslayout/CssLayoutListeners.java
index 21a48888d6..ee75d6ed59 100644
--- a/server/tests/src/com/vaadin/tests/server/component/csslayout/CssLayoutListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/csslayout/CssLayoutListeners.java
@@ -10,4 +10,4 @@ public class CssLayoutListeners extends AbstractListenerMethodsTest {
         testListenerAddGetRemove(CssLayout.class, LayoutClickEvent.class,
                 LayoutClickListener.class);
     }
-}
\ No newline at end of file
+}
diff --git a/server/tests/src/com/vaadin/tests/server/component/datefield/DateFieldConverterTest.java b/server/tests/src/com/vaadin/tests/server/component/datefield/DateFieldConverterTest.java
index 25ee0a38a9..f5467b2d18 100644
--- a/server/tests/src/com/vaadin/tests/server/component/datefield/DateFieldConverterTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/datefield/DateFieldConverterTest.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/server/tests/src/com/vaadin/tests/server/component/fieldgroup/CaseInsensitiveBinding.java b/server/tests/src/com/vaadin/tests/server/component/fieldgroup/CaseInsensitiveBinding.java
index e571576990..ea34d8b04e 100644
--- a/server/tests/src/com/vaadin/tests/server/component/fieldgroup/CaseInsensitiveBinding.java
+++ b/server/tests/src/com/vaadin/tests/server/component/fieldgroup/CaseInsensitiveBinding.java
@@ -82,4 +82,4 @@ public class CaseInsensitiveBinding {
         assertTrue("This".equals(form.firstName.getValue()));
     }
 
-}
\ No newline at end of file
+}
diff --git a/server/tests/src/com/vaadin/tests/server/component/label/LabelConverters.java b/server/tests/src/com/vaadin/tests/server/component/label/LabelConverters.java
index 9d71db89a6..e6cecee1bf 100644
--- a/server/tests/src/com/vaadin/tests/server/component/label/LabelConverters.java
+++ b/server/tests/src/com/vaadin/tests/server/component/label/LabelConverters.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/server/tests/src/com/vaadin/tests/server/component/select/SelectListeners.java b/server/tests/src/com/vaadin/tests/server/component/select/SelectListeners.java
index c7703303d3..2a1cc0deb0 100644
--- a/server/tests/src/com/vaadin/tests/server/component/select/SelectListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/select/SelectListeners.java
@@ -17,4 +17,4 @@ public class SelectListeners extends AbstractListenerMethodsTest {
         testListenerAddGetRemove(Select.class, BlurEvent.class,
                 BlurListener.class);
     }
-}
\ No newline at end of file
+}
diff --git a/server/tests/src/com/vaadin/tests/server/component/table/TableListeners.java b/server/tests/src/com/vaadin/tests/server/component/table/TableListeners.java
index 6cc522f8c7..fbe5bb3146 100644
--- a/server/tests/src/com/vaadin/tests/server/component/table/TableListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/table/TableListeners.java
@@ -38,4 +38,4 @@ public class TableListeners extends AbstractListenerMethodsTest {
         testListenerAddGetRemove(Table.class, ColumnReorderEvent.class,
                 ColumnReorderListener.class);
     }
-}
\ No newline at end of file
+}
diff --git a/server/tests/src/com/vaadin/tests/server/component/tree/TreeListeners.java b/server/tests/src/com/vaadin/tests/server/component/tree/TreeListeners.java
index e14ebe739d..8d5b499264 100644
--- a/server/tests/src/com/vaadin/tests/server/component/tree/TreeListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/tree/TreeListeners.java
@@ -24,4 +24,4 @@ public class TreeListeners extends AbstractListenerMethodsTest {
         testListenerAddGetRemove(Tree.class, CollapseEvent.class,
                 CollapseListener.class);
     }
-}
\ No newline at end of file
+}
diff --git a/server/tests/src/com/vaadin/tests/server/component/window/WindowAttach.java b/server/tests/src/com/vaadin/tests/server/component/window/WindowAttach.java
index f9c93d307b..586300f650 100644
--- a/server/tests/src/com/vaadin/tests/server/component/window/WindowAttach.java
+++ b/server/tests/src/com/vaadin/tests/server/component/window/WindowAttach.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/server/tests/src/com/vaadin/tests/server/navigator/ClassBasedViewProviderTest.java b/server/tests/src/com/vaadin/tests/server/navigator/ClassBasedViewProviderTest.java
index 89cb352b6f..bc067ddb88 100644
--- a/server/tests/src/com/vaadin/tests/server/navigator/ClassBasedViewProviderTest.java
+++ b/server/tests/src/com/vaadin/tests/server/navigator/ClassBasedViewProviderTest.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/server/tests/src/com/vaadin/tests/server/navigator/NavigatorTest.java b/server/tests/src/com/vaadin/tests/server/navigator/NavigatorTest.java
index 5dc28757a7..ff6028648e 100644
--- a/server/tests/src/com/vaadin/tests/server/navigator/NavigatorTest.java
+++ b/server/tests/src/com/vaadin/tests/server/navigator/NavigatorTest.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/server/tests/src/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java b/server/tests/src/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java
index 4be34707e4..85de106e23 100644
--- a/server/tests/src/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java
+++ b/server/tests/src/com/vaadin/tests/server/navigator/UriFragmentManagerTest.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/server/tests/src/com/vaadin/tests/util/UniqueSerializableTest.java b/server/tests/src/com/vaadin/tests/util/UniqueSerializableTest.java
index db9b5c02fa..abdc6c1a5c 100644
--- a/server/tests/src/com/vaadin/tests/util/UniqueSerializableTest.java
+++ b/server/tests/src/com/vaadin/tests/util/UniqueSerializableTest.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/server/tests/src/com/vaadin/ui/LabelDataSource.java b/server/tests/src/com/vaadin/ui/LabelDataSource.java
index 21d3e56d57..b57e83df8e 100644
--- a/server/tests/src/com/vaadin/ui/LabelDataSource.java
+++ b/server/tests/src/com/vaadin/ui/LabelDataSource.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/server/tests/src/com/vaadin/util/ReflectToolsGetFieldValueByType.java b/server/tests/src/com/vaadin/util/ReflectToolsGetFieldValueByType.java
index 540ffb852d..25f8ba7796 100644
--- a/server/tests/src/com/vaadin/util/ReflectToolsGetFieldValueByType.java
+++ b/server/tests/src/com/vaadin/util/ReflectToolsGetFieldValueByType.java
@@ -60,4 +60,4 @@ public class ReflectToolsGetFieldValueByType {
         } catch (Exception e) {
         }
     }
-}
\ No newline at end of file
+}
diff --git a/server/tests/src/com/vaadin/util/ReflectToolsGetPrimitiveFieldValue.java b/server/tests/src/com/vaadin/util/ReflectToolsGetPrimitiveFieldValue.java
index 1e1fafe31c..690f77d9a5 100644
--- a/server/tests/src/com/vaadin/util/ReflectToolsGetPrimitiveFieldValue.java
+++ b/server/tests/src/com/vaadin/util/ReflectToolsGetPrimitiveFieldValue.java
@@ -23,4 +23,4 @@ public class ReflectToolsGetPrimitiveFieldValue {
         }
         assertFalse(fieldValue instanceof Boolean);
     }
-}
\ No newline at end of file
+}
diff --git a/server/tests/src/com/vaadin/util/TestCurrentInstance.java b/server/tests/src/com/vaadin/util/TestCurrentInstance.java
index 09ef9514e5..666a0ef019 100644
--- a/server/tests/src/com/vaadin/util/TestCurrentInstance.java
+++ b/server/tests/src/com/vaadin/util/TestCurrentInstance.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