cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
Merge pull request #2205 from CocosRobot/updategeneratedsubmodule_1363687504

cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
Fixing compilation errors for win32.
Merge pull request #2206 from dumganhar/master

Fixing compilation errors for win32.
IOS, Added CCEditBoxImplIOS kEditBoxInputFlagSensitive settings.

Added case to hide IOS autocorrection in kEditBoxInputFlagSensitive
mode.
Readme with instructions on running the emulator correctly for developing cocos2d-x
update doc
Clearer description of command line options
Merge pull request #2213 from folecr/android_emulator_documentation

Readme with instructions on running the emulator correctly
Merge pull request #2211 from whitegfx/master

fixed #1842: Implementation of kEditBoxInputFlagSensitive setting for CCEditBoxImplIOS.
Update AUTHORS
Fixing compilation errors for linux.
Adding a space for target variable.
Merge pull request #2216 from dumganhar/master

Fixing compilation errors for linux.
fix a logic error and a memory leak in CCLabelBMFont.
Merge pull request #2218 from dumganhar/bmfont-logic-error

fix a logic error and a memory leak in CCLabelBMFont. This PR could fix wrong display of Score in WatermelonWithMe.
fix of wrong group of TimelineCallbackTest in TestCpp.vcxproj.filters.
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Merge pull request #2219 from dumganhar/master

fix of wrong group of TimelineCallbackTest in TestCpp.vcxproj.filters.
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings