Rename
Merge branch 'design_pic' into develop