Bug #5958 : typo in setAntiAliasTexParameters
Merge pull request #2301 from joshuastray/develop

Bug #5958 : typo in setAntiAliasTexParameters --by nopakos
bugfix: typo in _initFrameSize
Merge pull request #2307 from qsjia/develop

bugfix: typo in _initFrameSize
Added missing rotation property to TMX objects.
Fixed bug where resizing the screen caused cached canvases to draw at an incorrect offset.
Merge pull request #2311 from Robmaister/develop

Added missing rotation property to TMX objects
Merge pull request #2312 from Robmaister/pr-fix-tmx-drawing

Fixed TMX drawing bug
Issue #5941: improve canvas renderer's blendFunc
Merge branch 'Renderer' of https://github.com/cocos2d/cocos2d-html5 into Iss5941_WebGLRenderer
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss5941_WebGLRenderer
Merge pull request #2315 from dingpinglv/Iss5941_WebGLRenderer

Issue #5941: improve canvas renderer's blendFunc