更新
Merge branch 'beta' of https://github.com/iichin0708/PuzzleFighter into beta

Conflicts:
	Classes/BlockSprite.cpp
	Classes/Config.h
	Classes/GameScene.cpp
	proj.ios/PuzzleFighter.xcodeproj/project.pbxproj
画面縦表示　ヒント機能復帰