cosmetic + removed json recorder and moved to separate library
Merge remote-tracking branch 'origin/master'