Merge branch 'hotfix/20141119-block2'
bestelevenとやら
Merge branch 'hotfix/20141121-best' into develop