Merge branch 'master' into sass

Conflicts:
	WebContent/VAADIN/themes/base/tabsheet/tabsheet.scss
	theme-compiler/src/com/vaadin/sass/tree/ListRemoveNode.java
	theme-compiler/src/com/vaadin/sass/visitor/EachVisitor.java

diff --cc WebContent/VAADIN/themes/base/tabsheet/tabsheet.scss
index 37dae131e1bb2791a841c6b9ee64b04067b82a64,e8cd536024eabd013407a144498b65080e31edeb..a001605f278a01d7ab898787df1d4b0bb3137612
--- 1/WebContent/VAADIN/themes/base/tabsheet/tabsheet.scss
--- 2/WebContent/VAADIN/themes/base/tabsheet/tabsheet.scss
+++ b/WebContent/VAADIN/themes/base/tabsheet/tabsheet.scss
@@@ -33,10 -33,10 +33,10 @@@
        height: 1em;
        padding: 0.2em 0;
  }
- .#{$name}-hidetabs .#{$name}-tabcontainer {
 -.v-tabsheet-hidetabs > .v-tabsheet-tabcontainer {
++.#{$name}-hidetabs > .#{$name}-tabcontainer {
        display: none;
  }
 -.v-tabsheet-scroller {
 +.#{$name}-scroller {
        white-space: nowrap;
        text-align: right;
        margin-top: -1em;

diff --cc theme-compiler/src/com/vaadin/sass/handler/SCSSDocumentHandlerImpl.java
Simple merge

diff --cc theme-compiler/src/com/vaadin/sass/tree/VariableNode.java
Simple merge