Merge branch 'master' into grid

Change-Id: I2f1134ce1bd5e8dbb183881fc69120e964271245

diff --cc WebContent/VAADIN/themes/base/base.scss
index 0e19c8a3392415fbf6836be30ea392eea11632d2,fd3c5d067d196110224c8db3a6c9cb90a8a52086..58274edacbe28ad1e3ea80201b33fdf3b5020ad2
--- 1/WebContent/VAADIN/themes/base/base.scss
--- 2/WebContent/VAADIN/themes/base/base.scss
+++ b/WebContent/VAADIN/themes/base/base.scss
@@@ -15,9 -15,8 +15,10 @@@
  @import "inlinedatefield/inlinedatefield.scss";
  @import "dragwrapper/dragwrapper.scss";
  @import "embedded/embedded.scss";
 +@import "escalator/escalator.scss";
+ @import "fonts/fonts.scss";
  @import "formlayout/formlayout.scss";
 +@import "grid/grid.scss";
  @import "gridlayout/gridlayout.scss";
  @import "label/label.scss";
  @import "link/link.scss";