Merge develop
Merge develop
add image file
Merge branch feature/cho