Merge branch 'develop-3.0' of https://github.com/cocos2d/cocos2d-html5 into CCGame_dev3.0

Conflicts:
	cocos2d/core/platform/miniFramework.js