added some crud to shoppinglistitem controller and views
git conflict
git conflict 2