added comments
Merge branch 'GUI' into Connector
fixed json generator
JSON bug fixed