Added triangle, quad bezier, cubic bezier drawing to DrawNode
Readded trimmed semicolon
Added triangle, cubic bezier and quad bezier tests to DrawPrimitivesTest
Merge branch 'drawing_primitives' of github.com:ThePickleMan/cocos2d-x into drawing_primitives
Add selected image to slider
Merge branch 'develop' into fix-extensions-slider
fix cc
Add scale ratio to button touchdown
Merge branch 'develop' into fix-button-scale-to
Merge branch 'develop' into fix-extensions-slider
update ui animation with frame ease type
reduce useless convert
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