full photo view operational
Merge branch 'master' of https://github.com/CMPUT301W13T11/FoodBook.git

Conflicts:
	FooBook/res/values/strings.xml