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 #1 from chukong/master

update
Merge pull request #7 from chukong/master

合并原版
add umengshare share image introduce
modify umengshare comment
Merge pull request #9 from chukong/master

master
modify umengshare for support share image without text
Merge branch 'master' of github.com:htlxyz/quick-cocos2d-x

Conflicts:
	lib/sdk/umeng_share/umeng_share_android/umeng_share_android/com/quick2dx/sdk/UmengShareSDK.java
fixed bug in CCLuaStack::executeScriptFile()
porting ccsloader form v3quick
Merge branch 'develop'
Merge branch 'master' of github.com:htlxyz/quick-cocos2d-x
Merge pull request #411 from SunLightJuly/bug_fix

fixed bug in CCLuaStack::executeScriptFile()
Merge pull request #410 from htlxyz/master

Master
1.chipmunk c++ 封装开发
1.chipmunk joint c++封装开发