Issue #5956: Add release for getFromPool
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop
Bug #5958 : typo in setAntiAliasTexParameters
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
Merge pull request #2301 from joshuastray/develop

Bug #5958 : typo in setAntiAliasTexParameters --by nopakos
Feature #5941: Desactivate WebGL for iOS version < 8
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop
bugfix: typo in _initFrameSize
Merge pull request #2307 from qsjia/develop

bugfix: typo in _initFrameSize
Issue #5941: corrected mistakes of cc.ProtectedNode and ccui.Text
Merge pull request #2309 from dingpinglv/Iss5941_WebGLRenderer

Issue #5941: corrected mistakes of cc.ProtectedNode and ccui.Text
Issue #5933: cocostudio update text position
Merge pull request #2310 from VisualSJ/Renderer-webgl

Issue #5933: cocostudio update text position
Added missing rotation property to TMX objects.
Fixed bug where resizing the screen caused cached canvases to draw at an incorrect offset.
Issue #5933: anchorPoint error
Issue #5933: anchorPoint error
Merge pull request #2313 from VisualSJ/Renderer-anchorPoint

Issue #5933: anchorPoint error
Merge pull request #2311 from Robmaister/develop

Added missing rotation property to TMX objects