--
Merge branch 'master' of https://github.com/chuanweizhang2013/cocos2d-js