Merge branch 'master' into rpc

Conflicts:
	build/build.xml
	src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
	src/com/vaadin/terminal/gwt/client/Container.java
	src/com/vaadin/terminal/gwt/client/VPaintableWidget.java
	src/com/vaadin/terminal/gwt/client/ui/VAbstractPaintableWidget.java
	src/com/vaadin/terminal/gwt/client/ui/VButton.java
	src/com/vaadin/terminal/gwt/client/ui/VButtonPaintable.java
	src/com/vaadin/terminal/gwt/client/ui/VNativeButton.java
	src/com/vaadin/terminal/gwt/client/ui/VNativeButtonPaintable.java
	src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java
	src/com/vaadin/terminal/gwt/client/ui/VSlider.java
	src/com/vaadin/terminal/gwt/client/ui/VTextualDate.java
	src/com/vaadin/terminal/gwt/client/ui/VUpload.java
	src/com/vaadin/terminal/gwt/client/ui/VWindow.java
	src/com/vaadin/ui/Button.java
	tests/server-side/com/vaadin/tests/VaadinClasses.java

diff --cc src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
Simple merge

diff --cc src/com/vaadin/terminal/gwt/client/Util.java
Simple merge

diff --cc src/com/vaadin/terminal/gwt/client/ui/VButton.java
Simple merge

diff --cc src/com/vaadin/terminal/gwt/client/ui/VNativeButton.java
Simple merge

diff --cc src/com/vaadin/ui/AbstractComponent.java
Simple merge