Fixed broken nn.json file
Merge branch 'master' into api-1.1