init
fix
Merge branch 'merge_master_dev' of E:\cl\submodules\pixi.js with conflicts.