fix build error caused by libcurl on android x86
Merge https://github.com/cocos2d/cocos2d-x into test-before-release
Merge pull request #2221 from dumganhar/master

Updating JSTest, adding new resources.
Merge https://github.com/cocos2d/cocos2d-x into test-before-release
remove unsupported parameter in android
Merge pull request #2217 from minggo/test-before-release

fix build error caused by libcurl on android x86
Update vs2012 solution, adding dependence for libExtension.
Updating vs2010 project dependence.