Merge branch 'hotfix/20141129-blocks'
学生リポジトリ
Merge branch 'hotfix/20141201-gakusei' into develop