Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
fixed crash cause by incorrect font name.
Merge branch 'v3-newaudio' of D:\github_repository\cocosNew into v3
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
roll back to fix compile error on jenkins
Fixed the video player not showing on iOS if it's not in FullScreen mode
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
fixed can's set outline color for system font correctly on IOS.
[AUTO]: updating luabinding automatically
Merge pull request #7691 from Dhilan007/v3

fixed can's set outline color for system font correctly on IOS.
[ci skip]
[AUTO][ci skip]: updating cocos2dx_files.json
Merge pull request #7695 from CocosRobot/update_cocosfiles_1407380077

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

[AUTO]: updating luabinding automatically
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