added json generator
Merge branch 'develop' into 17-update and
fix a small bug in the json generator

* develop:
  added json generator

Conflicts:
	build.gradle