Added GCM stuff
Pulled
GCM registration works
Fixed Merge Conflicts and Tested Code