Merge branch 'trunk-gd' of https://github.com/griddynamics/hive into fb-YAHOO-339-trunk-gd

Conflicts:
	build.properties