gcm registration working
Merge branch 'nick'