GCM Sync
Merge branch 'master' of https://github.com/rhok-explorers/android-client