Merge pull request #12 from cocos2d/develop

update coco2d-x
migrate saveToFile compatible with new renderer
RenderTexture saveToFile will return true
Merge branch 'develop' into develop_RenderTextureImprovement
closed #4337:label support create by font name,compatible with old labelTTF.
fixed inappropriate usage of inline.
typo fix and coding style improvements.
merage cocos2d-x lua templateMerge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
set ANDROID_SDK_ROOT to correct path
Merge pull request #5672 from minggo/develop

set ANDROID_SDK_ROOT to correct path
fix incorrect implementation of Label::getContentSize
re-open generate binding glue codes.
Merge pull request #5673 from Dhilan007/develop_gblur

re-open configuration for generate binding glue codes.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Merge pull request #5657 from Dhilan007/develop_label

closed #4337:label support create by font name,compatible with old labelTTF
[AUTO]: updating luabinding automatically
update console to latest version
add runtime template
Merge pull request #5674 from CocosRobot/update_lua_bindings_1394527022

[AUTO]: updating luabinding automatically
Merge pull request #5675 from minggo/develop

update console to latest version