fix: when use different count custom properties in CocosBuilder will get wrong custom properties in game
Compilation error fix for blackberry.
Compilation error fix for Marmalade.
Adds app.icf for TestLua. Enlarges memory size.
[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.
Merge branch 'master' into master_nutty_modify_framework_removeuselesssample
add xaml project for wp8
Merge pull request #5004 from koowolf/xaml_template

add xaml project for wp8
Merge branch 'master' into master_nutty_modify_framework_removeuselesssample
fixed bug of layout
Fixed bugs of "update" and "anchor point"