fix: when use different count custom properties in CocosBuilder will get wrong custom properties in game
Compilation error fix for blackberry.
removed winsock2.h and restored timeval struct to fix broken winrt builds
removed libcurl from wp8. Fixed missing CocoStudio GUI files and tests
Merge pull request #4935 from MSOpenTech/wp8-remove-curl

Removed CURL from WP8 project. Fixed CocoStudio changes that broke all WP8 and WinRT builds
[ci skip]
Compilation error fix for Marmalade.
Remove useless samples
Adds app.icf for TestLua. Enlarges memory size.
Merge pull request #4938 from nutty898/master_nutty_modify_framework_removeuselesssample

Remove useless samples
[Mamalade] Adds app.icf TestLua template.
Merge pull request #4940 from dumganhar/blackberry-marmalade-fix

Compilation error fixes for Blackberry and Marmalade ports.
fix compiling errors for iOS projects
Merge pull request #4966 from minggo/master

fix compiling errors for iOS projects
update js-test submodule.
Merge pull request #4970 from Dhilan007/master_222

update js-test submodule.
[ci skip]
Merge pull request #4240 from xhcnb/fix_master_nodeloader

 Fixed a bug that it will get wrong custom properties when use different count custom properties in CocosBuilder.
Update AUTHORS [ci skip]
Fixed bugs.