Merge commit '63dc0'

Conflicts:
	WebContent/VAADIN/themes/base/common/common.css

diff --cc WebContent/VAADIN/themes/base/common/common.css
index 3c08a9d584cc3cc69db40c15a243c791837d8e4b,adf84ac3b74d5dbacea7efa0a0beb76d47024cf2..222ec5912f2dc423857811cf65b1d766db5618f1
--- 1/WebContent/VAADIN/themes/base/common/common.css
--- 2/WebContent/VAADIN/themes/base/common/common.css
+++ b/WebContent/VAADIN/themes/base/common/common.css
@@@ -242,6 -231,7 +242,11 @@@ div.v-app-loading 
      cursor: default;
  }
  
- }
 +.v-clip {
 +      overflow: hidden;
 -}
++}
++
+ .v-scrollable {
+       overflow: auto;
+       -webkit-overflow-scrolling: touch;
++}