Merge branch 'master' into valo

Conflicts:
	build.properties

Change-Id: I2477f2b420506d1b41d29d9bb1e361d66bedb68d

diff --cc build.properties
index b524afd139ed264928459a88bfebadb1941e603c,a4fc1954f420b0fcba269b2cd6c016b0e71f41f9..0fc074ce69f2adec2d94b8545041c5b27d48abc2
--- 1/build.properties
--- 2/build.properties
+++ b/build.properties
@@@ -5,5 -5,6 +5,6 @@@ vaadin.vendor=Vaadin Lt
  vaadin.url=http://vaadin.com
  vaadin.java.version=1.6
  vaadin.version=0.0.0.unversioned-development-build
 -vaadin.sass.version=0.9.2
 +vaadin.sass.version=0.9.6
+ gwt.version=2.6.0.vaadin2
  commons-io.version=2.4