Cocos2d-x3.1対応
Merge branch 'master' into roguelikegame

Conflicts:
	cocos/base/CCDirector.cpp