Bug fix for user watching status
Merge branch 'master' of https://github.com/xpush/messengerX