Merge branch 'refs/heads/master' into 'snapshot/7.5'

author Teamcity <build@vaadin.com>

Thu, 16 Apr 2015 05:55:14 +0000 (08:55 +0300)

committer Teamcity <build@vaadin.com>

Thu, 16 Apr 2015 05:55:14 +0000 (08:55 +0300)
author Teamcity <build@vaadin.com>
Thu, 16 Apr 2015 05:55:14 +0000 (08:55 +0300)
committer Teamcity <build@vaadin.com>
Thu, 16 Apr 2015 05:55:14 +0000 (08:55 +0300)
diff --cc WebContent/VAADIN/themes/base/grid/grid.scss
Simple merge
diff --cc client/src/com/vaadin/client/widgets/Grid.java
Simple merge
author	Teamcity <build@vaadin.com>
	Thu, 16 Apr 2015 05:55:14 +0000 (08:55 +0300)
committer	Teamcity <build@vaadin.com>
	Thu, 16 Apr 2015 05:55:14 +0000 (08:55 +0300)
		1	2
WebContent/VAADIN/themes/base/grid/grid.scss	patch \|	diff1 \|	diff2 \|	blob \| history
client/src/com/vaadin/client/widgets/Grid.java	patch \|	diff1 \|	diff2 \|	blob \| history