Merge branch 'hotfix/20141121-best'
いくつかブロック
Merge branch 'hotfix/20141121-blocks' into develop