Updated cache to overwrite existing recipes with matching id's and added
tests for imgurController and Photo
Did some refactoring.
Did some refactoring.
Merge branch 'master' of git@github.com:CMPUT301W13T04/Food.git
Merge branch 'master' of https://github.com/CMPUT301W13T04/Food.git
Sting.xml updated
String.xml updated
Fixed our tests to work with android
Merge branch 'master' of git@github.com:CMPUT301W13T04/Food.git

Conflicts:
	src/com/github/cmput301w13t04/food/test/DatabaseTest.java
	src/com/github/cmput301w13t04/food/test/ImgurTest.java
	src/com/github/cmput301w13t04/food/test/PhotoTest.java
fixed our tests to work in android
fixed some minor warnings
Manage Recipe: Toast Bug fixed
Publish Recipe bug fixed: Toasts result
Delete Ingredient without picture: Bug Fixed
Keyboard will stay in caps mode in at least Edit Ingredient
Quantity(fixed)
UI Keypad Bugs Fixed
Merged UI enhancements with search.
Merge branch 'SearchRecipeFix'

Conflicts:
	AndroidManifest.xml
	res/layout/activity_manage_ingredient.xml
	res/values/strings.xml