fix add item button link
edit link name on shoppinglist/index view
fix conflicts