Feature #5950 Add Facebook API  upgrade Facebook sdk
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop_new

Conflicts:
	external/pluginx/platform/facebook.js
apprequest link comment
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop
Merge pull request #2324 from jianglong0156/develop

Facebooktest