Doc #5829: Fix issues in AffineTransform and Geometry inline docs
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop
Fixed #5848: Use real texture pixel size in cc.SpriteFrame's initialization
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop
Merge pull request #2167 from pandamicro/develop

Fixed #5848: Use real texture pixel size in cc.SpriteFrame's initialization