Refactored out use of JSONObject in the protocol in favor of TextMessage.
Minor cleanup.
Revert "Minor cleanup."

This reverts commit a3d648618eb0f7ccc81c91e6fce51032ebd25c6d.
Revert "Refactored out use of JSONObject in the protocol in favor of TextMessage."

This reverts commit 9531aadad8e4bd9e0c00bccf1e48cfcebbfced88.
Merge remote-tracking branch 'upstream/master'