Merge branch 'master' into valo

Change-Id: Ifeb36e6c0acd156b7714f96f32ad7d4ff8416100

diff --cc WebContent/license.html
Simple merge

diff --cc build.properties
index 074fdac09dadcd68aecb73941ecf704daba36878,1c8268ee472cc593fe1f342f60e3a807439723c4..a7871ad1efec0295997aa94dade9f15427a46aca
--- 1/build.properties
--- 2/build.properties
+++ b/build.properties
@@@ -5,6 -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.6
 +vaadin.sass.version=0.9.7
- gwt.version=2.6.0.vaadin2
+ gwt.version=2.6.0.vaadin3
  commons-io.version=2.4