Merge branch 'hotfix/20141121-blocks'
朝の時点で危ないところを追加
Merge branch 'hotfix/20141129-blocks' into develop