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
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop
Issue #5933: setClippingType (only STENCIL of canvas)
Issue #5933: setClippingType (only STENCIL of canvas)
Merge pull request #2316 from VisualSJ/develop

Issue #5933: setClippingType (only STENCIL of canvas)
Sprite setTexture. Listen for the load event.
Sprite setTexture. Listen for the load event.
Merge pull request #2321 from VisualSJ/develop

Sprite setTexture. Listen for the load event.
Fixed #5964: Overwrite existing viewport to support more devices
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop