テスト:03に変更
Merge branch 'master' of https://github.com/hama0214/nativeAca

Conflicts:
	Classes/HelloWorldScene.cpp
Merge branch 'master' of https://github.com/hama0214/nativeAca