don't include unneeded header file
Merge pull request #2424 from minggo/master

don't include unneeded header file
fixed #2076: Adding a method CCBReader::setResolutionScale for setting resolution scale manually
Merge pull request #2425 from dumganhar/iss2076-setResolutionScale

fixed #2076: Adding a method CCBReader::setResolutionScale for setting resolution scale manually
fix a typo.
Correct log output in js_cocos2dx_CCTMXLayer_getTiles
Merge pull request #2426 from dumganhar/master

fix a typo in js_cocos2dx_CCTMXLayer_getTiles.
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
Merge pull request #2427 from CocosRobot/updategeneratedsubmodule_1366690273

cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
issue #2075: Adding spine editor support. Adding a new test 'SpineTest' in TestCpp, adding the parse code in "extensions/spine". It works only on iOS now.
issue #2075: Updating TestCpp for mac.
Adding spine/spine-cocos2dx.h to cocos-ext.h.
fixed #2075: Updating iOS template.
issue #2075: Updating extensions project for linux, native client and marmalade.
issue #2075: Adding spinetest in TestCpp for win32.
fix memory leak in FontTest
Merge pull request #2435 from minggo/master

fix memory leak in FontTest
issue #2075: Updating TestCpp project setting for marmalade and linux.
issue #2075: Updating Makefile of TestCpp for native client port.
tabify for makefile.