Changes to IngredientModel and dialog boxes in MyPantry.
Merge branch 'master' of https://github.com/kylejamesross/CMPUT301W13T09.git
Dialogbox now edits ingredients and Changes to IngredientController and
IngredientModel