New message format

fixing AGPUSH-1044
hum, was confused by https://github.com/edewit/aerogear-unifiedpush-server/blob/new-message-format/push/src/main/java/org/jboss/aerogear/unifiedpush/message/UnifiedPushMessage.java#L40 where `payload` is an attribute of the `message`