issue #3049:Add XMLHttpRequest lua binding and corresponding test sample
issue #3409:Add XMLHttpRequest lua binding and corresponding test sample
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp

Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
issue #3409:Add XMLHttpRequest lua binding and corresponding test sample
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp
#3049:Add XMLHttpRequest lua binding and corresponding test sample
issue #3049:Add XMLHttpRequest lua binding and corresponding test sample
#3049:Add LICENSE_JSON4LUA and some constant values.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp

Conflicts:
	build/cocos2d_samples.xcodeproj/project.pbxproj
	samples/Lua/TestLua/Resources/luaScript/mainMenu.lua
issue #3049:Add XMLHttpRequest lua binding and corresponding test sample
issue #3049:Reset .project file in pro.android.
Merge pull request #4023 from samuele3hu/developHttp

issue #3049:Add XMLHttpRequest lua binding and corresponding test sample