Add JSON annotations to Message.java

Add annotations to Message.java so that when a message is returned it is sent as a valid JSON structure rather than a naked string.