Fixed protobuf
Updated json files
Added Token to GooglePush, added members to Group, fixed FileLocation