update ui animation with frame ease type
reduce useless convert
Fixes to asset manager in the MASTER branch
issue #2050: unsigned int to int
Merge pull request #1 from cocos2d/develop

sync with cocos2d-x
issue #2050: delete max/minGID, fix firstGID bug
issue #2050: use static_cast
closed #2050: Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug2050_tilemap_firstgid_bug

Conflicts:
	cocos/2d/CCTMXLayer.cpp
closed #2050: fix js glue code.
modify template
modify ui
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop
fixed #3456
issue #3456 replace jsoncpp to rapidjson.
issue #3456 ios test rapidjson.
Merge branch 'develop' into #3456

Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/editor-support/cocostudio/CCDataReaderHelper.cpp
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
	cocos/editor-support/cocostudio/CCSSceneReader.cpp
adapt ui
modify template
ingore .git