Changed image_naming conventions.
Merge branch 'master' of ssh://git@github.com/Torboto/cmput301W13T07.git

Conflicts:
	Team07RecipeFinder/src/ca/ualberta/cs/team07recipefinder/RecipeController.java
	Team07RecipeFinder/src/ca/ualberta/cs/team07recipefinder/ViewRecipeActivity.java
Merge branch 'master' of ssh://git@github.com/Torboto/cmput301W13T07.git