Changing client side messages to be in JSON format
Merging branch json1