change version
make lua works ok on iOS
issue #2254 : Add plugin weibo for iOS.
fixed #2254 : Add sample code for plugin weibo on iOS.
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Update the JS binding code of plugin.
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Merge pull request #2759 from natural-law/master

Add plugin weibo for iOS [master]
Update the license in the sample code.
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