Merge branch 'hotfix/20141210-blocks'
g4b重複排除
Merge branch 'hotfix/20141210-g4b' into develop