Issue #4323: Fix properties double declaration issue for jsDoc
Merge branch 'develop-3.0' of git://github.com/cocos2d/cocos2d-html5 into develop-3.0

Conflicts:
	tools/jsdoc_toolkit/build.xml
Issue #4323: Fix path issue in build.xml
Issue #4323: Fix singleton issue and function issue for jsDoc
Issue #4323: Fix duplicate issue for jsDoc
Merge branch 'develop-3.0' of git://github.com/cocos2d/cocos2d-html5 into develop-3.0
Issue #4323: Update build.xml
Merge pull request #1670 from pandamicro/develop-3.0

Issue #4323: Fix issues for jsDoc