[AUTO][ci skip]: updating cocos2dx_files.json
Merge pull request #6076 from CocosRobot/update_cocosfiles_1396259549

[AUTO][ci skip]: updating cocos2dx_files.json
Label:fixed possible blink if label contains shadow.
1. Hide CameraTest2. 2. Correct the projection setting, fix camera center test projection.
Merge pull request #6077 from Dhilan007/develop_label

Label:fixed possible blink if label contains shadow.
use xxhash in win32 and wp8
fix the lua template error that would lead to crash when do rotate
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket
fixed PhysicsBody::setAngularVelocityLimit incorrect function call
Merge branch 'quadcommand-optimize' of https://github.com/minggo/cocos2d-x into quadcommand-optimize

Conflicts:
	cocos/2d/cocos2d_wp8.vcxproj
	cocos/2d/cocos2d_wp8.vcxproj.filters
Merge pull request #5998 from bmanGH/feature/fix_STRING_TEXTURE_label_sortAllChildren_crash

closed #4626: Crash if label's type is STRING_TEXTURE and label->sortAllChildren is called.
Update AUTHORS [ci skip]
Update CHANGELOG [ci skip]
[AUTO]: updating luabinding automatically
Merge pull request #6083 from CocosRobot/update_lua_bindings_1396318132

[AUTO]: updating luabinding automatically
Updates websocket to the latest release v1.23.
Merge pull request #16 from koowolf/quadcommand-optimize

use xxhash in win32 and wp8
Merge pull request #6081 from samuele3hu/develop_socket

fix the lua template error that would lead to crash when do rotate
Merge pull request #6078 from boyu0/3.0rc1_test

1. Hide CameraTest2. 2. Correct the projection setting, fix camera cente...
Merge pull request #6066 from minggo/quadcommand-optimize

use xxhash to generate material id