Shopの修正
Merge branch 'master' of github.com:kissykazuya/MS

Conflicts:
	FHRS/Match/MatchViewController.m
	FHRS/SceneGame.m
	FHRS/ViewController.h