Upgraded C2DM to GCM, work in progress, feedback to go