Merge branch 'hotfix/20141107-block1'
mess-y関連
Merge branch 'hotfix/20141107-mess-y' into develop