Fix memory leak
+ [NEW]: setting the font for Editbox text
+ [NEW]: setting the font for Editbox placeholder
+ [NEW]: setting the color for Editbox placeholder
+ [NEW]: updated test cases to show the new functionality
small indentation fix
Update CCImage.cpp
add update
Merge branch 'luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into luaruntime
fix the bug that `EditBox` can’t response that ‘changed’,`ended` and ‘return’ event for lua
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_fix
Remove hard codes
Remove hard codes
closed #4568: Application crashes on closing if CC_ENABLE_CACHE_TEXTURE_DATA is enabled.
CC_SAFE_RELEASE(_eventDispatcher); should be after 'delete _renderer;'
in Director's destructor.
Makes 'compareRenderCommand' as a static function instead of a global function
fix the bug that exit layer can’t end SimpleAudioEngine
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAudio
fixed xiaomi show ip error
closed #4863, Zipalign the apk generated with release mode.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into issue4863
closed #4903: Build libcurl.a with openssl
[AUTO]: updating luabinding automatically
Merge pull request #6320 from CocosRobot/update_lua_bindings_1397789417

[AUTO]: updating luabinding automatically