Did some refactoring.
Merge branch 'master' of git@github.com:CMPUT301W13T04/Food.git
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