Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
fixed Armature::getBoundingBox() is wrong when bone's display is null
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
add TimelineAction
support relative path for reading json
add AsyncReader
Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3

Conflicts:
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioTimelineActionTest/TimelineActionTestScene.cpp
remove unused files
modify cocostudio Android.mk
add TimeLineAction into project
Merge pull request #6 from pipu/v3_kaile

V3 kaile
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
add hd resource
add TimelineActionData
change read name
change NodeCache to NodeReader
change NodeCache to NodeReader
add hd resource