Adding photos to ingredients completely done.
Manage ingredient now loads the photo that has just been taken if
accepted.
User can cancel photo-taking process at any time with proper control
flow.
Merge remote-tracking branch 'origin/master' into AddRecipe

Conflicts:
	src/com/github/cmput301w13t04/food/ActivityManageIngredient.java