Json methods

Encode/Decode
Merge remote-tracking branch 'origin/master'

Conflicts:
	ApplicationServer/.idea/workspace.xml