Merge branch 'master' into grid-columnreorder

Conflicts:
	uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeaturesTest.java
	uitest/src/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java

Change-Id: Ic77c717b9bbdcc38585382d4944ee4491aba3f7d

4 files changed, 40 insertions, 19 deletions

diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/functions/_transition-property-name.scss b/WebContent/VAADIN/themes/valo/util/bourbon/functions/_transition-property-name.scss
index 111deeb70f..6ceae72102 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/functions/_transition-property-name.scss
+++ b/WebContent/VAADIN/themes/valo/util/bourbon/functions/_transition-property-name.scss
@@ -14,7 +14,7 @@
 @function transition-property-name($prop, $vendor: false) {
   // put other properties that need to be prefixed here aswell
   @if $vendor and $prop == transform {
-    @return unquote('-'+$vendor+'-'+$prop);
+    @return unquote('-' + $vendor + '-' + $prop);
   }
   @else {
     @return $prop;
diff --git a/WebContent/VAADIN/themes/valo/util/readme.txt b/WebContent/VAADIN/themes/valo/util/readme.txt
new file mode 100644
index 0000000000..6da898220f
--- /dev/null
+++ b/WebContent/VAADIN/themes/valo/util/readme.txt
@@ -0,0 +1,8 @@
+The Bourbon library has been modified to work around the limitations of the Sass Compiler.
+The following changes should be taken into account if Bourbon is upgraded to a newer
+version:
+
+file _transition-property-name.scss, function transition-property-name: added space around
+the operation '+'. This changed one line from
+@return unquote('-'+$vendor+'-'+$prop); 
+to @return unquote('-' + $vendor + '-' + $prop);
\ No newline at end of file
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index ef60364202..c1102f4682 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -87,9 +87,9 @@
     </servlet>
 
     <servlet>
-        <!-- This servlet is a separate instance for the sole purpose of 
-            testing #12446 (com.vaadin.tests.components.ui.TimeoutRedirectResetsOnActivity) 
-            because it modifies the VaadinService timeout parameters -->
+        <!-- This servlet is a separate instance for the sole purpose of testing 
+            #12446 (com.vaadin.tests.components.ui.TimeoutRedirectResetsOnActivity) because 
+            it modifies the VaadinService timeout parameters -->
         <servlet-name>VaadinApplicationRunnerWithTimeoutRedirect</servlet-name>
         <servlet-class>com.vaadin.launcher.ApplicationRunnerServlet</servlet-class>
     </servlet>
@@ -115,6 +115,17 @@
         <async-supported>true</async-supported>
     </servlet>
 
+    <!-- For testing custom push path with, for example, Weblogic 12.1.2 -->
+    <servlet>
+        <servlet-name>VaadinApplicationRunnerWithPushPathTest</servlet-name>
+        <servlet-class>com.vaadin.launcher.ApplicationRunnerServlet</servlet-class>
+        <init-param>
+            <param-name>pushPath</param-name>
+            <param-value>ws</param-value>
+        </init-param>
+        <async-supported>true</async-supported>
+    </servlet>
+
     <servlet-mapping>
         <servlet-name>Embed App 1</servlet-name>
         <url-pattern>/embed1/*</url-pattern>
@@ -149,6 +160,11 @@
     </servlet-mapping>
 
     <servlet-mapping>
+        <servlet-name>VaadinApplicationRunnerWithPushPathTest</servlet-name>
+        <url-pattern>/run-pushpath/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
         <servlet-name>IntegrationTest</servlet-name>
         <url-pattern>/integration/*</url-pattern>
     </servlet-mapping>
diff --git a/WebContent/release-notes.html b/WebContent/release-notes.html
index 6cedeb1e21..efae20187e 100644
--- a/WebContent/release-notes.html
+++ b/WebContent/release-notes.html
@@ -41,26 +41,23 @@
         <ul>
             <li><a href="#overview">Overview of Vaadin
                     @version@ Release</a></li>
-            <li><a href="#changelog">Change log for Vaadin
+            <li><a href="#changelog">Change Log for Vaadin
                     @version@</a></li>
             <li><a href="#enhancements">Enhancements in Vaadin
                     @version-minor@</a></li>
-            <li><a href="#incompatible">Incompatible or behavior-altering changes in
-                    @version-minor@</a></li>
-            <li><a href="#knownissues">Known issues in
-                    @version-minor@</a></li>
-            <li><a href="#limitations">Limitations in
+            <li><a href="#incompatible">Incompatible or Behavior-altering Changes in
                     @version-minor@</a></li>
+            <li><a href="#knownissues">Known Issues</a></li>
+            <li><a href="#limitations">Limitations</a></li>
             <li><a href="#vaadin">Vaadin Installation</a></li>
             <li><a href="#package">Package Contents</a></li>
-            <li><a href="#migrating">Migrating from Vaadin 6 to
-                    Vaadin 7</a></li>
+            <li><a href="#migrating">Migrating from Vaadin 6</a></li>
             <li><a href="#dependencies">Vaadin @version@
                     dependencies</a></li>
             <li><a href="#upgrading">Upgrading to Vaadin
                     @version-minor@</a></li>
             <li><a href="#supportedversions">Supported
-                    technologies</a></li>
+                    Technologies</a></li>
             <li><a href="#vaadinontheweb">Vaadin on the Web</a></li>
         </ul>
 
@@ -74,7 +71,7 @@
         </p>
 
         <!-- ================================================================ -->
-        <h3 id="changelog">Change log for Vaadin @version@</h3>
+        <h3 id="changelog">Change Log for Vaadin @version@</h3>
 
         <p>This release includes the following closed issues:</p>
 
@@ -127,7 +124,7 @@
                 Notes for Vaadin 7.3.0</a>.
         </p>
 
-        <h3 id="incompatible">Incompatible or behavior-altering changes in @version-minor@</h3>
+        <h3 id="incompatible">Incompatible or Behavior-altering Changes in @version-minor@</h3>
         <ul>
             <li>
                 <p>The org.json and com.google.gwt.json libraries have been replaced by elemental.json.</p>
@@ -140,7 +137,7 @@
             <li>Window's accessibility shortcut was moved to server-side. Now setCloseShortcut overrides the default value, while addCloseShortcut can be used to add more than one shortcut key for closing the window.
                 The protected value closeShortcut in Window was removed.</li>
         </ul>
-        <h3 id="knownissues">Known issues</h3>
+        <h3 id="knownissues">Known Issues</h3>
         <ul>
             <li>Drag'n'drop in a Table doesn't work on touch devices running
                 Internet Explorer (Windows Phone, Surface)
@@ -332,7 +329,7 @@
             directory of the web application that uses validation.
         </p>
 
-        <h2 id="upgrading">Upgrading from Vaadin 7.1 to Vaadin @version-minor@</h2>
+        <h2 id="upgrading">Upgrading to Vaadin @version-minor@</h2>
 
         <p>When upgrading from an earlier Vaadin version, you must:
         </p>
@@ -514,12 +511,12 @@
         </p>
 
         <ul>
-            <li>Mozilla Firefox 18-34</li>
+            <li>Mozilla Firefox 18-35</li>
             <li>Mozilla Firefox 17 ESR, 24 ESR, 31 ESR</li>
             <li>Internet Explorer 8-11</li>
             <li>Safari 6-8</li>
             <li>Opera 16-27</li>
-            <li>Google Chrome 23-39</li>
+            <li>Google Chrome 23-40</li>
         </ul>
 
         <p>