Add json field datatype
Merge remote-tracking branch 'linchus/master'