add json support
Merge branch 'master' of https://github.com/syrenio/aic-bigdata