added jsb support for AssetsMAnager
purgeStoragePath added
key with hash to support multiple assetsManager
DelegateProtocol is weak-referenced again
applied cocos2d-x coding style
issue #2460: add glfw include and library file to Xcode
style edited
issue #2460: glfw window version
issue #2460: glfw windows version: remove some unused function
issue #2460: rename EGLView::Create to EGLView->create
issue #2460: glfw mac version
issue #2460: glfw win32 project file
Update cocos2d_specifics.hpp

add need unroot
Update cocos2d_specifics.cpp

add need unroot
issue #2640: glfw linux version
Merge branch 'develop' into Iss2460-glfw-refractor

Conflicts:
	cocos2d_libs.xcodeproj/project.pbxproj
	cocos2dx/platform/mac/CCEGLView.mm
	samples/Cpp/TestCpp/proj.linux/main.cpp
	samples/Cpp/TestCpp/proj.win32/main.cpp
[Mac] Adding WebsocketTest and SocketIOTest.
issue #2433:Add more deprecated function and modify some test
Adding test for issue http://www.cocos2d-x.org/issues/2401 .
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator

Conflicts:
	scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto.cpp
	scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto.hpp
	scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto_api.js