closed #4337:label support create by font name,compatible with old labelTTF.
fixed inappropriate usage of inline.
Merge pull request #5667 from lihex/develop

fix the lua template
ask to set ANT_ROOT, and add more redeable information
Merge pull request #5670 from minggo/develop

ask to set ANT_ROOT, and add more redeable information
typo fix and coding style improvements.
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
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
update console submodule