Conflicts: WebContent/VAADIN/themes/base/treetable/treetable.css WebContent/release-notes.html src/com/vaadin/terminal/gwt/client/VUIDLBrowser.java src/com/vaadin/terminal/gwt/client/ui/textfield/VTextField.java