Edit Ingredient in to Master

Cache and updated the main activity to use Activity_EditIngredient.java.

AddIngredient.java is no longer needed or used, and can be removed.