Changes to UI
Merge branch 'master' into vaadin-ui
merge newest master in vaadin-ui branch