rename prject
Merge branch 'master' into editable_by_panel
add icons in master