Merge branch 'master' of E:\idea\jstest with conflicts.
Merge branch 'master' of https://github.com/puag/jstest
update imgMgr.js to json