updated comment
Added missing headers
Fixed crash in case of server failure.
Merge branch '20140401-dev-stable' into feature-20141215-fix-conversation-glitches