better json generator
Merge branch 'BetterJSONGenerator' into developpement