Upgrade Gradle build to finer-grained gms dependencies
Merge branch 'master' of github.com:incoming-inc/android-template-app