Made SocketStatus and SocketOperatingMode enums serializable and
de-serializable for JSON messages
Added logic to JsonEncoder.
Added JsonMessageEncodingTest, which shows that encoding Message objects
into Json messages works!
Refactored MessageType out of Message
Removed structureType and messageDataStructure out of MessageContainer
(useless)
Merge branch 'master' of
https://github.com/clascelles/CEG_4912_cerberus_system.git

Conflicts:
	cerberus-server/src/main/java/com/cerberus/server/workflow/CurrentWorkflow.java
Merge branch 'master' of
https://github.com/clascelles/CEG_4912_cerberus_system.git

Conflicts:
	cerberus-server/src/main/java/com/cerberus/server/workflow/CurrentWorkflow.java