Updated settings layout
Google Play Services version change
Merge remote-tracking branch 'origin/master'