[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #3790 from CocosRobot/updategeneratedsubmodule_1380076576

[AUTO] : updating submodule reference to latest autogenerated bindings
issue #2837: Modify tojs/cocos2dx_extension.ini to skip some functions
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_test
Merge pull request #3793 from samuele3hu/master_test

issue #2837: Modify tojs/cocos2dx_extension.ini to skip some functions
remove android iOS template
[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #3794 from CocosRobot/updategeneratedsubmodule_1380081507

[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
fix release2.2 : lua template linux cannot build
Merge pull request #3795 from minggo/remove-android-ios-template

[ci skip]Remove android ios template
Merge pull request #3796 from dabingnn/release22_bug_hot_fix

[ci skip]Release22 bug hot fix
fix release2.2 : lua template linux：copy lua scripts when building
Merge pull request #3798 from dabingnn/release22_bug_hot_fix

[ci skip]Release22 bug hot fix
Modify lua template project and remove setDesignResolutionSize set in test lua and test js sample
Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x
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
change tab to 4 space
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]