Merge branch 'hotfix/20140710-cho'
se-kirara
Merge branch 'hotfix/20140710-sekirara'
Merge branch 'hotfix/20140710-sekirara' into develop
darksammoner
Merge branch 'hotfix/20140710-darksummoner'
Merge branch 'hotfix/20140710-darksummoner' into develop
amebaのゲーム用API
Merge branch 'hotfix/20140710-gameapi'
Merge branch 'hotfix/20140710-gameapi' into develop
trickstarと後継2つ
Merge branch 'hotfix/20140710-trickstar' into develop