replace NetDimenison.Json with Json.Net
Merge branch 'feature' into dev
Merge branch 'dev'