Merge pull request #1 from cocos2d/v3

Cocos2d-x Merge
Update vs project setting for lua-empty-test
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
Merge pull request #8953 from samuele3hu/v3_new_spine

Update vs project setting for lua-empty-test
Add include directories to fix compile error on the window and remove useless `PreBuildEvent`
[ci skip] Update CHANGELOG
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
XCode:4.6 to 5.1
bugfix: setting forget the contentSize.
Fixed winrt DLL link errors when using extern consts
Merge pull request #8956 from samuele3hu/v3_new_spine

Add include directories to fix compile error on the window and remove useless `PreBuildEvent` for lua-template-default
Merge pull request #8957 from jonhari/patch-1

XCode:4.6 to 5.1
Merge pull request #8960 from kyokomi/feature/CSLoader_setPropsForNodeFromProtocolBuffers

bugfix: setting forget the contentSize.
[ci skip]Update Authors
Merge pull request #8961 from Appgeneration/winrt_link_fix

Winrt link fix
Merge pull request #5 from cocos2d/v3

Keep update with cocos2d/cocos2d-x