added display for number of guests in shopping list
Merge branch 'master' of https://github.com/h10r/dinnerplanner-swing
merge master
Merge branch 'master' of https://github.com/h10r/dinnerplanner-swing
merge
Conflicts:
	src/se/kth/csc/iprog/dinnerplanner/model/DinnerModel.java
ingredient viewer number of guests changes
Merge branch 'master' of https://github.com/h10r/dinnerplanner-swing
merge
deleted method in mainsidebar