Doc #5829: Fix issues in AtlasNode inline docs
Doc #5829: Fix issues in Node inline docs(half done)
Merge branches 'develop' and 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop

Conflicts:
	cocos2d/core/base-nodes/CCNode.js
Doc #5829: Fix issues in Node inline docs(half done)
Doc #5829: Fix issues in Node inline docs and refactor Node's functions to match JSB
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop
Merge pull request #2164 from pandamicro/develop

Doc #5829: Fix issues in AtlasNode and Node inline docs