reduce useless convert
Merge pull request #1 from cocos2d/develop

sync with cocos2d-x
modify template
modify ui
adapt ui
modify template
ingore .git
modify create_project
add README.md
modify cocos README.md
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop

Conflicts:
	template/multi-platform-js/Classes/AppDelegate.cpp
Reverts submodules
Reverts bindings-generator reference.
modify linux tempalte
modify linux template
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
modify license time
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop

Conflicts:
	tools/bindings-generator