ingredients view changes
Merge branch 'master' of https://github.com/h10r/dinnerplanner-swing
merge master with ingrediendts changes
moved some logic for dishView to dinnerModel
constructor of ingredient view class now expects model instance as parameter
Merge branch 'master' of https://github.com/h10r/dinnerplanner-swing
merge changes to master
Merge branch 'master' into hendrik

Conflicts:
	src/se/kth/csc/iprog/dinnerplanner/swing/view/DishView.java
before merge with master shaun's master