modified the output json format in rest server to remove unnecessary structures auto generated by jackson
merge with develop (new license)
solved merge conflicts