fixed no effect with stopping tween between two frames
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
change tab to 4 space
change tab to 4 space
Optimization for Value
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Lua template should fail to launch on lua error

Without this change, the app continues to run, attempts to access the
badly-initialised scene and issues more error messages. This causes
further errors every frame, covering up the original error in the output
 add config parser
modify lua_debugger.c
Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3

Conflicts:
	external
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
move win menu bar to sysmenu
Improves GLProgram

Adds vetex attrib bind class
Adds license to VertexAttribBind
fix the include error
Merge branch 'newV3' into improved_glprogram

Conflicts:
	cocos/2d/CCGLProgram.cpp
	cocos/2d/CCGLProgram.h
Improves code a little bit
Improvements for Attributes and Uniform API
rename mac simulator app's file simulatorconfig class
Merge pull request #1 from chuanweizhang2013/v3luaruntime

V3luaruntime