Fix for #399 - Conversations appearing under wrong status'
Correct issue with conversation icon being the wrong one when it's made to disappear
Merge pull request #404 from BlythMeister/BetaVersion

Fix for #399 - Conversations appearing under wrong status'
Merge remote-tracking branch 'Upstream/develop' into Upstream_release