Modify lua template project and remove setDesignResolutionSize set in test lua and test js sample
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_test
update version and CHANGELOG
Merge pull request #3800 from minggo/master

[ci skip]update version and CHANGELOG
Merge pull request #3799 from samuele3hu/master_test

Modify lua template project and remove setDesignResolutionSize set in test lua and test js samples[ci skip]
Merge pull request #3802 from Dhilan007/master

[ci skip]fix crash at listViewEvent::LISTVIEW_EVENT_UPDATE_CHILD
Add "MainMenu" menu to userdefault lua test sample
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_test
Merge pull request #3804 from Dhilan007/master

[ci skip]Fix crash at ZipFile::~ZipFile() on Android.
Merge pull request #3803 from samuele3hu/master_test

[ci skip]Add "MainMenu" menu to userdefault lua test sample
[master] Updating BlackBerry project configurations and fixing multi-platform-lua could not find lua script.
[master] Updating template for BB.
Merge pull request #3805 from dumganhar/2.2-bb-fix

[master] Updating BlackBerry project configurations and fixing multi-platform-lua could not find lua scripts.
fix a bug that index out of range
Merge pull request #3806 from minggo/master

[ci skip]fix a bug that index may out of range
Fix compile fail on vs2010