shinra-game
Merge branch 'hotfix/20140423-shinra'