Merge pull request #6 from cocos2d/master

update template
remove not found files
modify port
modify FileServer port
remove c++ setDesignResolutionSize
Merge pull request #7 from cocos2d/master

update console
Refactor #4365: Bind layers' constructors with init functionality in JSB
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
Refactor #4365: Bind sprite constructors with init functionality in JSB
Refactor #4365: Make sprite extend test compatible in both JSB and Web
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Update the reference of submodule "cocos2d-console".
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
[AUTO] : updating jsbinding automatically
fix the andriod.mk
Merge pull request #130 from lihex/master

fix the andriod.mk, gui -> ui.
Merge pull request #127 from CocosRobot/update_js_bindings_1394631437

[AUTO] : updating jsbinding automatically
Merge pull request #122 from natural-law/master

Update the reference of submodule "cocos2d-console".
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js