added new count for inbox
Merge remote-tracking branch 'origin/jem' into jem
Merge branch 'jem' into jay
added handlers