Move google-play-services to workspace

Don't load the google-play-services framework from some
crazy other project.
project specific .settings and code cleanup
Merge branch 'master' of https://github.com/shalperin/android-wms-demo