Merge remote-tracking branch 'upstream/develop' into develop
SILK-133 the first version of right/left legend
Merge remote-tracking branch 'upstream/develop' into develop
Add modifications to help message
Merge commit '67904efa4d7daa0a64276ab085b4680510affb59' into tarek-dev

* commit '67904efa4d7daa0a64276ab085b4680510affb59':
  Add modifications to help message
  SILK-133 the first version of right/left legend
Add spy able properties to default-nts.json and default-ts.json.
Cleanup default.json.
Fix query panel editor.html.