[AME-9909] responds to all review comments, adding TODOs, renaming classes
[AME-9909] Added GCM message recieving and displaying in the Andriod app