move
Merge branch 'v3quick' into v3quick_win

Conflicts:
	quick/player/src/PlayerProtocol.cpp
remove unused files
move
move
Merge branch 'v3quick' into v3quick_win

Conflicts:
	quick/lib/ProjectConfig/SimulatorConfig.cpp
	quick/lib/ProjectConfig/SimulatorConfig.h
move
move
fix file mode
move
Merge branch 'v3quick' of github.com:dualface/cocos2d-x into v3quick_win
fix win32 compile errors
add welcome app
enable High DPI support
cleanup
move
Merge branch 'v3quick' of https://github.com/dualface/cocos2d-x into v3quick_win

Conflicts:
	quick/lib/event/CCScriptEventDispatcher.cpp
	quick/lib/lua_bindings/auto/lua_cocos2dx_auto.cpp
	quick/lib/lua_bindings/manual/CCLuaStack.cpp
move
move
move