Fixing issues caused by Vaadin 7 changes (and missing features), now using Vaadin 7.0.0-rc1, almost working