Merge branch 'hotfix/20141210-blocks2'
ログレス
Merge branch 'hotfix/20141210-logres' into develop