Add UI Editor test case for Lua
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_ui_binary
Add a newline
clean up Fast TMX code
clean up Fast TMX code2
Merge branch 'v3' into fast_tmx

Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
modify bundle3d
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
fix listView item click move
fix listView Item move respond to click event
add fast tmx files to Xcode project file
using stable sort for quads
Merge branch 'v3' into fixTouchEvent

Conflicts:
	cocos/ui/UIWidget.cpp
fixed #4693: override addChild by name
modify origin-pos stuff
modify filetime save formate
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
Merge pull request #40 from chuanweizhang2013/v3luaruntime

modify save file format
1. add SceneBinary to 2.x
Merge pull request #42 from lvlonggame/v3

modify bundle3D