Merge branch 'master' of https://github.com/CMPUT301W13T11/FoodBook.git

Conflicts:
	FooBook/src/ca/ualberta/cmput301w13t11/FoodBook/FullImageEditPhotosActivity.java
sdf
Merge branch 'master' of https://github.com/CMPUT301W13T11/FoodBook.git
Merge branch 'master' of https://github.com/CMPUT301W13T11/FoodBook.git