Handle both data and notification payloads in the same GCM push

[macdonst]

When I push the following JSON:

{
      "data": {
            "title": "Hey there",
            "body": "This is the body of the notification",
            "key1": "message1",
            "key2": "message2"
        },
        "notification": {
            "title": "Hello, World",
            "icon": "ic_launcher",
            "body": "This is a notification that will be displayed ASAP."
        }
}

I end up with the following mangled data:

{
  "title": "Hey there",
  "message": "This is the body of the notification",
  "additionalData": {
    "key1": "message1",
    "key2": "message2",
    "notification": "Bundle[{e=1, body=This is a notification that will be displayed ASAP., icon=ic_launcher, title=Hello, World}]",
    "collapse_key": "io.cordova.hellocordova",
    "foreground": true
  }
}

if there is both a data and notification part the push plugin should handle both.

[lock]

This thread has been automatically locked.