Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime
add config window top support
add getplatform function
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime

Conflicts:
	templates/lua-template-runtime/frameworks/runtime-src/Classes/runtime/Runtime.cpp
	templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.mm
Fix an issue that the break point stops twice at the same function
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
add link resource support
fixed writablePath
Merge pull request #66 from chuanweizhang2013/v3luaruntime

update v3
Merge pull request #65 from cocos2d/v3

update  v3
Merge pull request #31 from cocos2d/v3

update v3
Merge pull request #67 from chuanweizhang2013/v3luaruntime

update v3
fixed error
mac writable path
Merge pull request #68 from chuanweizhang2013/v3luaruntime

add mac app name in writable path
Merge pull request #69 from cocos2d/v3

update v3
open WIFI is not necessary for runtime
Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
fix merge error