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]
fix crash at listViewEvent::LISTVIEW_EVENT_UPDATE_CHILD
Merge pull request #3802 from Dhilan007/master

[ci skip]fix crash at listViewEvent::LISTVIEW_EVENT_UPDATE_CHILD
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_test