Issue #5781: Update ENGINE_VERSION and refactor some deprecated function usages
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop

Conflicts:
	cocos2d/core/platform/CCConfig.js
Merge pull request #2068 from pandamicro/develop

Issue #5781: Update ENGINE_VERSION and refactor some deprecated function usages