Updating the build.gradle file to the newest version
Merge branch 'master' into gradle

Conflicts:
	build.gradle