Merge remote-tracking branch 'origin/master' into grid

author Teemu Suo-Anttila <teemusa@vaadin.com>

Fri, 28 Nov 2014 09:42:54 +0000 (11:42 +0200)

committer Teemu Suo-Anttila <teemusa@vaadin.com>

Fri, 28 Nov 2014 09:43:26 +0000 (11:43 +0200)
author Teemu Suo-Anttila <teemusa@vaadin.com>
Fri, 28 Nov 2014 09:42:54 +0000 (11:42 +0200)
committer Teemu Suo-Anttila <teemusa@vaadin.com>
Fri, 28 Nov 2014 09:43:26 +0000 (11:43 +0200)
diff --cc client/src/com/vaadin/client/ApplicationConnection.java
Simple merge
author	Teemu Suo-Anttila <teemusa@vaadin.com>
	Fri, 28 Nov 2014 09:42:54 +0000 (11:42 +0200)
committer	Teemu Suo-Anttila <teemusa@vaadin.com>
	Fri, 28 Nov 2014 09:43:26 +0000 (11:43 +0200)