Merge branch diffs

Authored by andreyc on Jun 20 2018, 4:33 AM.

Description

Merge branch diffs

Merged Changes

CommitAuthorDetailsCommitted
3c486aa9bea8asemke
Added some boilerplate code to add later icons for arrays and objects in… 
Jun 18 2018
15f14b7051e2asemke
*.json files can be recognized as ASCII. so, do the check for the json… 
Jun 18 2018
5f0e5e1d876casemke
In the JSON tree view, resize the columns to fit the content and use… 
Jun 18 2018