gradle -  new build.gradle
Merge remote-tracking branch 'origin/master'

Conflicts:
	build.gradle
	src/main/AndroidManifest.xml