Added unified gradle setup
Merge remote-tracking branch 'origin/16' into 16

Conflicts:
	build.properties