Merge branch 'hotfix/20140704-onepiece'
opop.pupu.jp
Merge branch 'hotfix/20140707-opop' into develop