change labels
Merge remote-tracking branch 'origin-richk/master'
fix play services lib path
fixes to maps
Merge remote-tracking branch 'origin-richk/master'