Move return functionality to new activity base class
Merge remote-tracking branch 'github-ssh/master'

Conflicts:
	src/com/example/FoodFinder/RestaurantActivity.java