change version
make lua works ok on iOS
Merge pull request #2759 from natural-law/master

Add plugin weibo for iOS [master]
issue #2257: make ios template work
Merge pull request #2761 from natural-law/master

Update the license in the sample code.
issue #2257:change copyright of template
fixed conflict
Merge pull request #2762 from minggo/modify-ios-template

Modify ios template
issue #2143: Adding CCEditBox::getDelegate.
fixed #2143:  cc.ScrollView(TableView, EditBox).setDelegate(tmp object) causes crash.
Merge pull request #2763 from dumganhar/jsb-delegate-crash-master

fixed #2143: cc.ScrollView(TableView, EditBox).setDelegate(tmp object) causes crash.
Update cocos2dx_extension.ini
1.  change “bool isEnabled()”  to "bool isEnabled() const".
2.  dolete license.
issue #2103 add cocosbuilder lua test sample
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into test_bind_cocosbuilder
issue #2103 add cocosbuilder lua test sample
Merge pull request #2767 from chengstory/master_Components#2

1.  change “bool isEnabled()”  to "bool isEnabled() const".
issue #2103 add cocosbuilder lua test sample
Merge pull request #2770 from samuele3hu/test_bind_cocosbuilder

add cocosbuilder lua test sample
[AUTO] : updating submodule reference to latest autogenerated bindings