fixed bug and comment stuff
add new item
Merge branch 'dev'
add item image