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
issue #3401: physical lua banding script and auto script
Merge pull request #2 from cocos2d/develop

update
Fixed mistake in documentation addImage doesn't support gif format
Fix for missing field in particle file.
support mingw
issue #3401: physical lua banding script, add testlua->physics test
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss3401_physical_lua_binding

Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/scripting/lua/bindings/CCLuaStack.cpp
	cocos/scripting/lua/script/Cocos2d.lua
	cocos/scripting/lua/script/Cocos2dConstants.lua
issue #3401: add physics lua auto generate to android.mk
issue #3401: update cmake project set
RenderQuad with bigger size

It uses 18 bits for texture id
and 10 bits for shader id
This is a temporal fix