Some small changes to the Controller
Merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	RecipeFinderTests/bin/classes/ca/ualberta/team2recipefinder/test/RecipeModelTest.class
	RecipeFinderTests/bin/classes/ca/ualberta/team2recipefinder/test/RecipeTest.class
	Team2RecipeFinder/src/ca/ualberta/team2recipefinder/views/RecipeGalleryActivity.java