Merge branch 'hotfix/20141210-mine'
いろいろ
Merge branch 'hotfix/20141210-steam' into develop