Merge pull request #12 from cocos2d/develop

update coco2d-x
migrate saveToFile compatible with new renderer
fix ease elastic action error
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.
Add event type to ListView
Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed
Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed
add EnumChildNodesByName, walk node tree with callback
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
correct naming convetion
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