Merge branch 'master' of https://github.com/shamaton/traning_cocos2dx
こまごまと調整