Merge branch 'develop' of https://github.com/chuanweizhang2013/cocos2d-x into develop
Merge branch 'develop' of https://github.com/chuanweizhang2013/cocos2d-x into develop
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
update external library, add iOS x86_64 and arm64 architectures, support Xcode5.1 iPhone simulator(64 bit)
extract arm64 architectures form .a file, add condition link arguments.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into support_for_xcode_iphone_64bit_simulator
fix typo, add release condition link arguments.
add i386 architecture to each mac .a file
fix win32 crash while click close button.
[AUTO]: updating luabinding automatically
Merge pull request #5796 from CocosRobot/update_lua_bindings_1394786638

[AUTO]: updating luabinding automatically
lua tempalte support for linux
Merge pull request #5797 from minggo/lua-template-linux

lua tempalte support for linux
fix close crash in linux and mac
LabelAtlas:fixed display incorrect color.
MenuItem:using Label to replace LabelTTF.
fix: Make Close Menu  invisible for iOS platform
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_3_fix
add websockets link
Merge pull request #5800 from minggo/lua-template-linux

add websockets link
copy lua files