Merge branch 'master' of https://github.com/javaConductor/gservInstaller

Conflicts:
	build.gradle
Merge branch 'master' of https://github.com/javaConductor/gservInstaller

Conflicts:
	build.gradle