Merge branch 'devUpstream' into my-release
make kCCBMaxTrackedDirectories to 1000;
Merge branch 'my-release'
js compile jsc;
Merge branch 'master' of off:/home/gitMobile/cocosbuilder