Merge branch 'hotfix/20140604-twinangel'
huluと遊び系追加
Merge branch 'hotfix/20140609-warosu' into develop