Implemented View and Edit Ingredient activities, as well as updated
Cache and updated the main activity to use Activity_EditIngredient.java.

AddIngredient.java is no longer needed or used, and can be removed.
Merge pull request #20 from CMPUT301W13T04/EditIngredient

Edit Ingredient in to Master