stubbed out amfToJson, jsonToAmf
Merge branch 'master' into amf