closed #2346: use shader program to set uniform
closed #2349, Add user login/logout plugin UC.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
issue #2285: ccColor3B --> const ccColor3B& for MotionStreak::create.
issue #2285: Adding MotionStreak test for TestJavascript.
close #2285: Updating tools/tojs/cocos2d-x.ini.
issue #2285: New JS-test MotionStreak.
Updating bindings-generator.
Add CCRect::unionWithRect
Add a new CCRect utility function called 'unionWithRect' which computes the minimum rectangle that contains the current rectangle and another given rectangle, similar to to the following .NET function: http://msdn.microsoft.com/en-us/library/ms521839.aspx
Add ccDrawSolidCircle
Similar to ccDrawCircle() primitives drawing function except the circle is filled.
Add extra safety to selector casting macros
Use static_cast<> instead of C-Style casts in the callfunc0_selector() etc. series of macros as this will allow the compiler to perform more stringent error checking and catch out cases where incompatible function signatures are being casted. This helps prevent very subtle and difficult to track down bugs where the signature of the function being casted is not what Cocos2dx expect - which can cause strange things to happen and corrupt the current stack frame.
- Fixing shadows for text with stroke in iOS
- Improved text shadows in Android (they look the same as in iOS)
Merge branch 'selector_cast_safety' of https://github.com/DarraghCoy/cocos2d-x into DarraghCoy-selector_cast_safety
Merge branch 'cc_draw_solid_circle' of https://github.com/DarraghCoy/cocos2d-x into cc_draw_solid_circle
closed #2363: Fixing compilation errors for JS projects.
Merge pull request #3056 from DarraghCoy/cc_draw_solid_circle

Add ccDrawSolidCircle
closed #2361:fix a crsash caused by Set::removeAllObjects
Merge pull request #3064 from minggo/iss2361-set-bugfix

fix a crash caused by Set::removeAllObjects()
Merge pull request #3062 from minggo/iss2346-opengl-error

Fixed a bug in CCTMXLayer when set uniform
[ci skip]