cocker 테마 수정
Merge remote-tracking branch 'origin/dev' into dev