Merge branch 'hotfix/20140523-yakkun'
gameinjp
Merge branch 'hotfix/20140523-gamuinjp' into develop