Update README.md
Merge branch 'master' into no_google-play-services