adding version for sps support
initial refactor of new more categorized sender api
renamed data to payload
wrong json lib
change frontend to new message structure
no need to differentiate
javadoc wording
change data to payload, also in strings
changed payload to user-data
removed unused import <- merge error
Merge branch 'new-message-format'
put simple-push field at the right level
Don't create a VariantInfo object for each token on ios and SPS
Call onSuccess at the right time
logger cleanups
Merge branch 'stats'
improved merge so categories no longer get duplicated
added test to see that merging categories works
Merge branch 'category'
fixed category spacing