Merge branch 'master' of https://github.com/kokoroiki/commu-ken

Conflicts:
	commu-ken-developer/app/View/Games/choice.ctp