Merge remote branch 'origin/6.8'

Merge remote branch 'origin/6.8'

Conflicts:
	src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
	src/com/vaadin/terminal/gwt/client/BrowserInfo.java
	src/com/vaadin/terminal/gwt/client/HistoryImplIEVaadin.java
	src/com/vaadin/terminal/gwt/client/ui/VButton.java
	src/com/vaadin/terminal/gwt/client/ui/VDateFieldCalendar.java
	src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java
	src/com/vaadin/terminal/gwt/client/ui/VNativeButton.java
	src/com/vaadin/terminal/gwt/client/ui/VNotification.java
	src/com/vaadin/terminal/gwt/client/ui/VView.java
	src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
	src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
	src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
	src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java
	src/com/vaadin/terminal/gwt/server/RequestTimer.java
	src/com/vaadin/ui/Button.java
	tests/test.xml
	tests/testbench/com/vaadin/tests/components/TouchScrollables.java