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

Conflicts:
	FooBook/res/layout/activity_view_search_result.xml
	FooBook/src/ca/ualberta/cmput301w13t11/FoodBook/model/ServerClient.java