Doc #5829: Improve some inline docs
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop
Fixed #5037: Add property support to RichText
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop
Merge pull request #2183 from pandamicro/develop

Fixed #5037: Add property support to RichText