Updated build.gradle

Conflicts:
	build.gradle