Notification count fixes

Supports the new format for push notifications

The UI counter-part of https://github.com/oaeproject/Hilary/pull/1023
TODO should be removed now