Merge branch 'master' into grid

author Leif Åstrand <leif@vaadin.com>

Tue, 22 Jul 2014 09:59:14 +0000 (12:59 +0300)

committer Leif Åstrand <leif@vaadin.com>

Tue, 22 Jul 2014 09:59:32 +0000 (12:59 +0300)
author Leif Åstrand <leif@vaadin.com>
Tue, 22 Jul 2014 09:59:14 +0000 (12:59 +0300)
committer Leif Åstrand <leif@vaadin.com>
Tue, 22 Jul 2014 09:59:32 +0000 (12:59 +0300)
diff --cc uitest/src/com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml
Simple merge
author	Leif Åstrand <leif@vaadin.com>
	Tue, 22 Jul 2014 09:59:14 +0000 (12:59 +0300)
committer	Leif Åstrand <leif@vaadin.com>
	Tue, 22 Jul 2014 09:59:32 +0000 (12:59 +0300)