Added extra-google-play-services (attempt #3) - extra-google-m2rep is included
Merge remote-tracking branch 'origin/master'