Merge branch 'mchinensedit'
Merge remote-tracking branch 'upstream/master'
MenuItemToggle is fixed

Supports callbacks now.
Updated MenuTest to supports the new API.
Updated CHANGELOG and version
Updatged Xcode project for Mac
Merge branch 'menuitem_toggle_fixes' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-menuitem_toggle_fixes
Reverting target to android-8.
Don't generate js binding glue code for CCMenuItem.*::initWithCallback.
Merge pull request #2787 from dumganhar/ricardoquesada-menuitem_toggle_fixes

Merge PR https://github.com/cocos2d/cocos2d-x/pull/2777
[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #2789 from CocosRobot/updategeneratedsubmodule_1370507591

[AUTO] : updating submodule reference to latest autogenerated bindings
[iOS] Enabling multiple touch event for TestJavascript, multi-platform-js, multiplatform-lua.Disabling multiple touch event for multi-platform-cpp.
Merge pull request #2791 from dumganhar/develop

[iOS] [develop] Enabling multiple touch event for TestJavascript, multi-platform-js, multiplatform-lua.Disabling multiple touch event for multi-platform-cpp.
Fix flags for debugger server socket

 * Works on iOS and Android
Fix windows build (nullptr instead of NULL when assigning to std::function)
Adds Base class to tests

Base class displays the Menu( <- O -> )
Improved in some tests the way to create entries.
Instead of defining the tests twice: the "create" method, and the entry
   in the array, it is only needed in the array (ActionsTest, SpriteTest
   and Texture2DTest)
Merge pull request #2792 from folecr/jsdb

Fix flags for debugger server socket
Update AUTHORS [ci skip]
Merge pull request #2795 from flaming0/sd-func-fix-win-build

Fix VS build (nullptr instead of NULL when assigning to std function)
Updating multi-platform-xxx template for win32.
Merge pull request #2802 from dumganhar/develop

Updating multi-platform-xxx template for win32. And some warning fixes.
Merge branch 'test_base_class' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-test_base_class