Merge pull request #1 from chukong/master

合并主线Mater
Merge pull request #2 from chukong/master

merge
Merge pull request #3 from chukong/master

合并原版本
Merge pull request #4 from chukong/master

合并版本
Merge pull request #6 from chukong/master

合并原版本
Merge pull request #7 from chukong/master

合并原版
Merge pull request #9 from chukong/master

master
modify ccsloader
fix multi touch error
update framework zip
update sample ui
add CCPhysicsWorld:setStepInterval()
Merge branch 'master' of github.com:chukong/quick-cocos2d-x

Conflicts:
	lib/framework_precompiled/framework_precompiled.zip
	template/PROJECT_TEMPLATE_01/res/framework_precompiled.zip
update mac player
update mac player
update player proj.mac
update mac player
update player proj.mac
Merge pull request #413 from htlxyz/master

modify ccsloader
Merge pull request #2 from chukong/master

move