Merge pull request #2 from cocos2d/master

update cocos2d/cocos2d-x
Merge pull request #3 from cocos2d/master

update cocos2d/cocos2d-x
Merge pull request #4 from cocos2d/master

update cocos2d/cocos2d-x
Merge pull request #5 from cocos2d/master

update cocos2d-x
Merge pull request #6 from cocos2d/master

update cocos2d/cocos2d-x
Add RemoveSelf Action

Add RemoveSelf Action, so we can simple call CCRemoveSelf to remove the
node from parent.
Add RemoveSelf Action
Add CCRemoveSelf Action
Add ActionRemoveSelf in TestCpp/ActionTest

Add ActionRemoveSelf in TestCpp/ActionTest
Improve font rendering performance
Allow to set EditBox font name and size separately
Resize CCEditBox subviews when contentSize changes

1. Place placeholder and text labels correctly;
2. Resize native view when parent content size changes.
Merge pull request #2303 from dumganhar/master

Updating SceneTest.lua.
CCEditBox test for separate font name/size setters
Merge pull request #2295 from SevInf/master

fixed #1999: CCEditBox iOS enchantments/bugfixes
Update AUTHORS
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
Merge pull request #2305 from CocosRobot/updategeneratedsubmodule_1365005271

cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
Merge pull request #2290 from Yodesoft/master

fixed #2000: Improve font rendering performance for linux platform.
Update AUTHORS