Notification count fixes

Supports the new format for push notifications

The UI counter-part of https://github.com/oaeproject/Hilary/pull/1023
When I upload a bunch of files and share them with a user at the same time, the activities don't seem to be coming in aggregated and individual notifications are shown.

![screen shot 2014-09-12 at 11 14 27](https://cloud.githubusercontent.com/assets/109850/4248457/ba773684-3a66-11e4-9f45-31268bebddf3.png)