Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-gc0630

Conflicts:
	tests/cpp-tests/Classes/NodeTest/NodeTest.cpp
	tests/cpp-tests/Classes/NodeTest/NodeTest.h