Adding new Robotium tests
Merge branch 'master' of https://github.com/ECE322TeamTeam/Food

Conflicts:
	src/com/github/cmput301w13t04/food/test/robotium/AddIngredientTest.java