commit
commit
commit
Merge branch 'master' of https://github.com/guivuikiong/cocos2d-js-test.git

Conflicts:
	blackwhite/project.json
	blackwhite/src/app.js