Merge branch 'hotfix/20140610-thegame'
ガンダム
Merge branch 'hotfix/20140610-gundam' into develop