PreferencesActivity: Actionbar back button now finishes the activity and doesn't recreate the MainScreen
MainScreen displays only restaurants, matching to preferences
Actionbar back button does the same as Navbar back button
Merge branch 'master' of https://github.com/cyberfuzzie/FoodFinder

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