Rollback some changes for GWT 2.7.0 compatibility.
Merge remote-tracking branch 'origin/master'

Conflicts:
	gradle.properties