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

17 files changed, 17 insertions, 17 deletions

diff --git a/server/src/com/vaadin/ui/components/calendar/CalendarComponentEvent.java b/server/src/com/vaadin/ui/components/calendar/CalendarComponentEvent.java
index 1f012157b5..dfb59e148b 100644
--- a/server/src/com/vaadin/ui/components/calendar/CalendarComponentEvent.java
+++ b/server/src/com/vaadin/ui/components/calendar/CalendarComponentEvent.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/src/com/vaadin/ui/components/calendar/CalendarComponentEvents.java b/server/src/com/vaadin/ui/components/calendar/CalendarComponentEvents.java
index 1904d69898..f01b465dd2 100644
--- a/server/src/com/vaadin/ui/components/calendar/CalendarComponentEvents.java
+++ b/server/src/com/vaadin/ui/components/calendar/CalendarComponentEvents.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/src/com/vaadin/ui/components/calendar/CalendarDateRange.java b/server/src/com/vaadin/ui/components/calendar/CalendarDateRange.java
index b78fda3136..18b98e1f6c 100644
--- a/server/src/com/vaadin/ui/components/calendar/CalendarDateRange.java
+++ b/server/src/com/vaadin/ui/components/calendar/CalendarDateRange.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/src/com/vaadin/ui/components/calendar/CalendarTargetDetails.java b/server/src/com/vaadin/ui/components/calendar/CalendarTargetDetails.java
index 1a3ef67377..3ea6c4d8f4 100644
--- a/server/src/com/vaadin/ui/components/calendar/CalendarTargetDetails.java
+++ b/server/src/com/vaadin/ui/components/calendar/CalendarTargetDetails.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/src/com/vaadin/ui/components/calendar/ContainerEventProvider.java b/server/src/com/vaadin/ui/components/calendar/ContainerEventProvider.java
index b025de6f9a..7c19395df2 100644
--- a/server/src/com/vaadin/ui/components/calendar/ContainerEventProvider.java
+++ b/server/src/com/vaadin/ui/components/calendar/ContainerEventProvider.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/src/com/vaadin/ui/components/calendar/event/BasicEvent.java b/server/src/com/vaadin/ui/components/calendar/event/BasicEvent.java
index 3f14145f0c..a1ccad2712 100644
--- a/server/src/com/vaadin/ui/components/calendar/event/BasicEvent.java
+++ b/server/src/com/vaadin/ui/components/calendar/event/BasicEvent.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/src/com/vaadin/ui/components/calendar/event/BasicEventProvider.java b/server/src/com/vaadin/ui/components/calendar/event/BasicEventProvider.java
index b2b74a5e52..9fa6baadad 100644
--- a/server/src/com/vaadin/ui/components/calendar/event/BasicEventProvider.java
+++ b/server/src/com/vaadin/ui/components/calendar/event/BasicEventProvider.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/src/com/vaadin/ui/components/calendar/event/CalendarEditableEventProvider.java b/server/src/com/vaadin/ui/components/calendar/event/CalendarEditableEventProvider.java
index 13e84df666..920600368e 100644
--- a/server/src/com/vaadin/ui/components/calendar/event/CalendarEditableEventProvider.java
+++ b/server/src/com/vaadin/ui/components/calendar/event/CalendarEditableEventProvider.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/src/com/vaadin/ui/components/calendar/event/CalendarEvent.java b/server/src/com/vaadin/ui/components/calendar/event/CalendarEvent.java
index 531ee72c7f..2ad8c777ff 100644
--- a/server/src/com/vaadin/ui/components/calendar/event/CalendarEvent.java
+++ b/server/src/com/vaadin/ui/components/calendar/event/CalendarEvent.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/src/com/vaadin/ui/components/calendar/event/CalendarEventProvider.java b/server/src/com/vaadin/ui/components/calendar/event/CalendarEventProvider.java
index fefb2ca9b6..35719a13f3 100644
--- a/server/src/com/vaadin/ui/components/calendar/event/CalendarEventProvider.java
+++ b/server/src/com/vaadin/ui/components/calendar/event/CalendarEventProvider.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/src/com/vaadin/ui/components/calendar/event/EditableCalendarEvent.java b/server/src/com/vaadin/ui/components/calendar/event/EditableCalendarEvent.java
index e8a27ad50f..df708697b8 100644
--- a/server/src/com/vaadin/ui/components/calendar/event/EditableCalendarEvent.java
+++ b/server/src/com/vaadin/ui/components/calendar/event/EditableCalendarEvent.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/src/com/vaadin/ui/components/calendar/handler/BasicBackwardHandler.java b/server/src/com/vaadin/ui/components/calendar/handler/BasicBackwardHandler.java
index 65e9c94dec..f4d47f89d4 100644
--- a/server/src/com/vaadin/ui/components/calendar/handler/BasicBackwardHandler.java
+++ b/server/src/com/vaadin/ui/components/calendar/handler/BasicBackwardHandler.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/src/com/vaadin/ui/components/calendar/handler/BasicDateClickHandler.java b/server/src/com/vaadin/ui/components/calendar/handler/BasicDateClickHandler.java
index ac2470e008..8d366ed52f 100644
--- a/server/src/com/vaadin/ui/components/calendar/handler/BasicDateClickHandler.java
+++ b/server/src/com/vaadin/ui/components/calendar/handler/BasicDateClickHandler.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/src/com/vaadin/ui/components/calendar/handler/BasicEventMoveHandler.java b/server/src/com/vaadin/ui/components/calendar/handler/BasicEventMoveHandler.java
index ae4c5fcc12..418e03d24a 100644
--- a/server/src/com/vaadin/ui/components/calendar/handler/BasicEventMoveHandler.java
+++ b/server/src/com/vaadin/ui/components/calendar/handler/BasicEventMoveHandler.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/src/com/vaadin/ui/components/calendar/handler/BasicEventResizeHandler.java b/server/src/com/vaadin/ui/components/calendar/handler/BasicEventResizeHandler.java
index ee7fc27360..6141c84c5b 100644
--- a/server/src/com/vaadin/ui/components/calendar/handler/BasicEventResizeHandler.java
+++ b/server/src/com/vaadin/ui/components/calendar/handler/BasicEventResizeHandler.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/src/com/vaadin/ui/components/calendar/handler/BasicForwardHandler.java b/server/src/com/vaadin/ui/components/calendar/handler/BasicForwardHandler.java
index e36c9e5756..96c3c097dc 100644
--- a/server/src/com/vaadin/ui/components/calendar/handler/BasicForwardHandler.java
+++ b/server/src/com/vaadin/ui/components/calendar/handler/BasicForwardHandler.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/src/com/vaadin/ui/components/calendar/handler/BasicWeekClickHandler.java b/server/src/com/vaadin/ui/components/calendar/handler/BasicWeekClickHandler.java
index 846fd7dd53..c52d0a5a82 100644
--- a/server/src/com/vaadin/ui/components/calendar/handler/BasicWeekClickHandler.java
+++ b/server/src/com/vaadin/ui/components/calendar/handler/BasicWeekClickHandler.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