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

19 files changed, 19 insertions, 19 deletions

diff --git a/client-compiler/src/com/vaadin/sass/linker/SassLinker.java b/client-compiler/src/com/vaadin/sass/linker/SassLinker.java
index 3183f4bfe7..dda6733384 100644
--- a/client-compiler/src/com/vaadin/sass/linker/SassLinker.java
+++ b/client-compiler/src/com/vaadin/sass/linker/SassLinker.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/client-compiler/src/com/vaadin/server/widgetsetutils/AcceptCriteriaFactoryGenerator.java b/client-compiler/src/com/vaadin/server/widgetsetutils/AcceptCriteriaFactoryGenerator.java
index ae7e117965..b7850e6370 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/AcceptCriteriaFactoryGenerator.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/AcceptCriteriaFactoryGenerator.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/client-compiler/src/com/vaadin/server/widgetsetutils/ConnectorBundleLoaderFactory.java b/client-compiler/src/com/vaadin/server/widgetsetutils/ConnectorBundleLoaderFactory.java
index 9b00142534..75225c52dc 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/ConnectorBundleLoaderFactory.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/ConnectorBundleLoaderFactory.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/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ArraySerializer.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ArraySerializer.java
index 38d97e9751..6ffd6c5462 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ArraySerializer.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ArraySerializer.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/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ClientRpcVisitor.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ClientRpcVisitor.java
index c966f7f65e..f382562341 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ClientRpcVisitor.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ClientRpcVisitor.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/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java
index f762a484b7..8a4ca8f795 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.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/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ConnectorInitVisitor.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ConnectorInitVisitor.java
index 293a6ca613..ea3b097fa2 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ConnectorInitVisitor.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ConnectorInitVisitor.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/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/CustomSerializer.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/CustomSerializer.java
index 00a19d2656..bb3dd4f61d 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/CustomSerializer.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/CustomSerializer.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/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/EnumSerializer.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/EnumSerializer.java
index cd6eebddd1..18e9652ed1 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/EnumSerializer.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/EnumSerializer.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/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/FieldProperty.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/FieldProperty.java
index e9ff4587fb..a31dafe05c 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/FieldProperty.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/FieldProperty.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/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/GeneratedSerializer.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/GeneratedSerializer.java
index 53b0022fd0..6afb172ea2 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/GeneratedSerializer.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/GeneratedSerializer.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/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/JsonSerializer.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/JsonSerializer.java
index 69445b3cc1..0509689850 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/JsonSerializer.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/JsonSerializer.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/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/MethodProperty.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/MethodProperty.java
index 1d9deef265..32aad92774 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/MethodProperty.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/MethodProperty.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/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/Property.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/Property.java
index 381af23b42..f07b1c29fd 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/Property.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/Property.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/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ServerRpcVisitor.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ServerRpcVisitor.java
index 651596c9cf..3f6ccf006f 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ServerRpcVisitor.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ServerRpcVisitor.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/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/StateInitVisitor.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/StateInitVisitor.java
index f58d1c5d40..046c5c4611 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/StateInitVisitor.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/StateInitVisitor.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/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/TypeVisitor.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/TypeVisitor.java
index aae610cdcd..028e4cc44d 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/TypeVisitor.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/TypeVisitor.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/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/WidgetInitVisitor.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/WidgetInitVisitor.java
index bac7f5a0f7..e3fee8d9ee 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/WidgetInitVisitor.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/WidgetInitVisitor.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/client-compiler/src/com/vaadin/tools/WidgetsetCompiler.java b/client-compiler/src/com/vaadin/tools/WidgetsetCompiler.java
index e57468c675..7c06e9d7af 100755
--- a/client-compiler/src/com/vaadin/tools/WidgetsetCompiler.java
+++ b/client-compiler/src/com/vaadin/tools/WidgetsetCompiler.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