Update 技术调研
Merge branch 'master' of https://github.com/7xnoap/cocos2djstutorial

Conflicts:
	Cocos2d-js 技术调研.md