Merge pull request #4106 from CocosRobot/updategeneratedsubmodule_1383719713

[AUTO] : updating submodule reference to latest autogenerated bindings
Merge branch 'master' into master_nutty_modifyfilenames

Conflicts:
	extensions/Android.mk
	extensions/proj.emscripten/Makefile
	extensions/proj.linux/Makefile
	extensions/proj.nacl/Makefile
	extensions/proj.win32/libExtensions.vcxproj
	extensions/proj.win32/libExtensions.vcxproj.filters
	samples/Cpp/TestCpp/proj.ios/TestCpp.xcodeproj/project.pbxproj
	samples/Cpp/TestCpp/proj.mac/TestCpp.xcodeproj/project.pbxproj
modify iOS and mac project
Fixed bugs
Merge pull request #4084 from nutty898/master_nutty_modifyfilenames

Master nutty modifyfilenames
Modify windows project
Merge pull request #4115 from nutty898/master_nutty_modifywindowspj

Modify windows project
fix some compiling errors on iOS
temp commit modify
remove unneed codes
Modify touch method.
Merge pull request #4126 from minggo/master

[ci skip]fix some compiling errors on iOS
Move file info storer from uihelper to guireader
Merge branch 'master' into master_nutty_modifywindowspj
temp commit modify
add "setUserObject" method
Merge branch 'master' of git://github.com/cocos2d/cocos2d-x
Merge pull request #4139 from nutty898/master_nutty_adjustframework

Master nutty adjustframework
Rename event interface
Merge branch 'master' into master_nutty_adjustframework