Fixed a armature's bug and a actionFrame's bug.
Merge pull request #2198 from dingpinglv/develop

Fixed a armature's bug and a actionFrame's bug.
Merge pull request #2197 from pandamicro/develop

Doc #5829: Improve inline docs
Doc #5829: Improve inline docs by refactoring @namespace to @class
Doc #5829: Improve inline docs for CCScheduler
Doc #5829: Improve inline docs for sprites folder
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop