Fixed the map key.
Fixed map key
Main
Migrated to Ubuntu 12.04
Fixed "JsonUtils" problem in TripPlanner
Fixed "JsonUtils" problem in TripPlanner
Merge pull request #2 from rstueven/2.3.2d

2.3.2d
Merge branch 'master' into 2.4.0

Conflicts:
	.classpath
	AndroidManifest.xml
	project.properties
	src/com/beerme/android/database/Beer.java
	src/com/beerme/android/database/BeerList.java
	src/com/beerme/android/database/BeerNote_My.java
	src/com/beerme/android/database/BeerNotesList.java
	src/com/beerme/android/database/Brewery.java
	src/com/beerme/android/database/BreweryList.java
	src/com/beerme/android/database/BreweryNote.java
	src/com/beerme/android/database/BreweryNotesList.java
	src/com/beerme/android/database/DbOpenHelper.java
	src/com/beerme/android/database/TableDefs.java
	src/com/beerme/android/database/TableDefs_3.java
	src/com/beerme/android/database/TableDefs_5.java
	src/com/beerme/android/database/TableDefs_6.java
	src/com/beerme/android/filechooser/FileExistsFragment.java
	src/com/beerme/android/filechooser/FileListFragment.java
	src/com/beerme/android/search/SearchActivity.java
	src/com/beerme/android/search/SuggestionProvider.java
	src/com/beerme/android/ui/AboutFrag.java
	src/com/beerme/android/ui/BeerActivity.java
	src/com/beerme/android/ui/BeerFrag.java
	src/com/beerme/android/ui/BeerListFrag.java
	src/com/beerme/android/ui/BeerMeMapActivity.java
	src/com/beerme/android/ui/BeerMeMapFragment.java
	src/com/beerme/android/ui/BeerNoteFrag.java
	src/com/beerme/android/ui/BeerNoteHC_Frag.java
	src/com/beerme/android/ui/BeerNotesFrag.java
	src/com/beerme/android/ui/BreweryActivity.java
	src/com/beerme/android/ui/BreweryListActivity.java
	src/com/beerme/android/ui/BreweryListFrag.java
	src/com/beerme/android/ui/BreweryNoteFrag.java
	src/com/beerme/android/ui/BreweryNoteHC_Frag.java
	src/com/beerme/android/ui/BreweryNotesFrag.java
	src/com/beerme/android/ui/EditableBeerNote.java
	src/com/beerme/android/ui/EditableBreweryNote.java
	src/com/beerme/android/ui/HoursFrag.java
	src/com/beerme/android/ui/MainActivity.java
	src/com/beerme/android/ui/MapFactory.java
	src/com/beerme/android/ui/NewsFrag.java
	src/com/beerme/android/ui/Splash.java
	src/com/beerme/android/ui/UpdatesFrag.java
	src/com/beerme/android/ui/actionbar/BeerMeActionBarActivity.java
	src/com/beerme/android/ui/tripplanner/DirectionsDisplayFragment.java
	src/com/beerme/android/ui/tripplanner/DirectionsFragment.java
	src/com/beerme/android/ui/tripplanner/MarkerDialogFragment.java
	src/com/beerme/android/ui/tripplanner/MessageHandler.java
	src/com/beerme/android/ui/tripplanner/TripPlannerFrag.java
	src/com/beerme/android/utils/Utils.java