Add fromName subfield
Change order
Merge branch 'master' into iOSPushNotification
Work on IOSPushNotification