changed scene numbering and layer index
Merge branch 'json'