Issue #4277: rename ccs.guiReader to cc.uiReader
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into Iss4277_ReleaseV3.0

Conflicts:
	samples/js-tests/src/CocoStudioTest/GUITest/UIButtonTest/UIButtonTest.js
	samples/js-tests/src/CocoStudioTest/GUITest/UICheckBoxTest/UICheckBoxTest.js
	samples/js-tests/src/CocoStudioTest/GUITest/UIImageViewTest/UIImageViewTest.js
	samples/js-tests/src/CocoStudioTest/GUITest/UILoadingBarTest/UILoadingBarTest.js
	samples/js-tests/src/CocoStudioTest/GUITest/UINodeContainerTest/UINodeContainerTest.js
	samples/js-tests/src/CocoStudioTest/GUITest/UIPageViewTest/UIPageViewTest.js
	samples/js-tests/src/CocoStudioTest/GUITest/UISliderTest/UISliderTest.js
	samples/js-tests/src/CocoStudioTest/GUITest/UITextAtlasTest/UITextAtlasTest.js
	samples/js-tests/src/CocoStudioTest/GUITest/UITextBMFontTest/UITextBMFontTest.js
	samples/js-tests/src/CocoStudioTest/GUITest/UITextFieldTest/UITextFieldTest.js
	samples/js-tests/src/CocoStudioTest/GUITest/UITextTest/UITextTest.js
	samples/js-tests/src/GUITest/UIScene.js
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into Iss4277_ReleaseV3.0

Conflicts:
	frameworks/cocos2d-html5
	frameworks/js-bindings/cocos2d-x
	tools/cocos2d-console
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into Iss4277_ReleaseV3.0
Merge pull request #139 from dingpinglv/Iss4277_ReleaseV3.0

Issue #4277: update cocos-console reference