Modified handling cbc based conversations
Modified refactored SDK to support previous master app.
Fixed potential logout crash.
Merge branch '20140401-dev-stable' into feature-20141215-fix-conversation-glitches