Merge branch 'hotfix-error_view'
Merge branch 'release'
Merge branch 'develop'
hotfix 첫번째 완료
테스트 완료 코드
Merge branch 'hotfix#20141029' into develop