Add Feature #5633:EventMouse should support getDelta, getDeltaX, getDeltaY functions
Merge pull request #1 from cocos2d/v3

Merge pull request #7604 from minggo/xcode-project-fix Xcode project fix
Merge pull request #2 from cocos2d/v3

update
Merge branch 'v3' of git@github.com:AppleJDay/cocos2d-x.git
Merge pull request #3 from cocos2d/v3

update
Merge pull request #4 from cocos2d/v3

update
Merge branch 'v3' of github.com:AppleJDay/cocos2d-x
replace tab to spaces. Fix compile error of UIRichTextTest.cpp in windows visual studio vs2013.
roll back to fix compile error on jenkins
Fixed the video player not showing on iOS if it's not in FullScreen mode
WP8 compile fix
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_wp8fix
extract ui,network and storage from cocos2d module and adjust relate CMakeLists.txt
Modify lua-template-default and lua-template-runtime project
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module

Conflicts:
	cocos/network/CMakeLists.txt
	cocos/storage/CMakeLists.txt
wp8 compile fix -additional
Update CMakeLists.txt for storage
camera, cameratest, drawNode3D squash
Update CCSpriteBatchNode.cpp

Setting opacity of a sprite (via setOpacity or FadeOut/In action) has the sprite turning black, it should simply be opaque.  

Cause is in bool SpriteBatchNode::initWithTexture, third line, "if(tex->hasPremultipliedAlpha())" 
Fix is making it "!if(!tex->hasPremultipliedAlpha())"
add to cocos2d.h