Merge branch 'hotfix/20141210-pokecheck'
いろいろ
CyBreakブロック
Merge branch 'hotfix/20141210-blocks2' into develop