Issue #5901: Facebook SDK Web's appRequest action info parameter seems wrap wrong informations
Merge pull request #2231 from VisualSJ/5901

Issue #5901: Facebook SDK Web's appRequest action info parameter seems w...
Merge pull request #2232 from pandamicro/develop

Docs #5883: Complete jsb apis
Fixed #5894: adds jsDocs to armature display and utils
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into Iss5894_CocostudioDocs
Merge pull request #2233 from dingpinglv/Iss5894_CocostudioDocs

Fixed #5894: adds jsDocs to armature display and utils
Issue #5888: Type resolution adaptation
Updates AUTHORS.txt
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into Iss5894_CocostudioDocs
Merge pull request #2234 from dingpinglv/Iss5894_CocostudioDocs

Updates AUTHORS.txt
Issue #5888: Type resolution adaptation
Merge pull request #2235 from VisualSJ/5888

Issue #5888: Type resolution adaptation
Issue #5888: Type resolution adaptation
Merge pull request #2236 from VisualSJ/5888

Issue #5888: Type resolution adaptation
Update Engine Version
Issue #5907: Fix issues of resolution policy's check