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
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop
Merge pull request #2 from cocos2d/develop

update
Merge pull request #3 from cocos2d/develop

sync original repo
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Merge pull request #4 from cocos2d/develop

sync original repo
Merge pull request #5 from cocos2d/develop

sync original repo
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop