Merge branch 'hotfix/20140521-ff14'
MtG追加
Merge branch 'hotfix/20140521-mtg' into develop