Merge branch 'hotfix/20140423-ch'
shinra-game
Merge branch 'hotfix/20140423-shinra' into develop