closed #2346: use shader program to set uniform
1. Add C++ code to decode ETC file
2. Configuration and function supportsETC()
change test case, all platform not can read pkm file
give Texture2D::_pixelFormat a default value in construction
closed #2349, Add user login/logout plugin UC.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Merge branch 'origin/develop'

Conflicts:
	cocos2dx/proj.ios/cocos2dx.xcodeproj/project.pbxproj
	cocos2dx/proj.win32/cocos2d.vcxproj.filters
adjust cocos2d.vcxproj.filters
issue #2328 refractor etc support:
1. GL_ETC1_RGB8_OES not defined will return not support hardware etc
2. remove some space and comments
issue #2328 refractor etc support:remove comments
PivotJoint class constructor will now take 3 or 4 arguments like in html5
pointQueryFirst in Space class returns invalid Shape when a shape is not found
Merge pull request #3048 from dabingnn/iss2328-refractor-etc

Iss2328 refractor etc
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.