CCPlatformMacros.h

Added std::nothrow for CREATE_FUNC.
avoid locking when message queue is empty in websocket
replace tabs with spaces.
create ActionTimelineNode
update Android.mk
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3
add file to mac project
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
update templates
update lua ini files
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3

Conflicts:
	tools/tolua/cocos2dx.ini
change tab to 4 space
update make file
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3

Conflicts:
	cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3
update timeline test
change name
change file name