removed jackson dependency in favor of minimal json parser
Merge remote-tracking branch 'origin/master'