Setup gradle
Merge remote-tracking branch 'origin/setup-gradle' into setup-gradle

Conflicts:
	build.gradle