Created Branch for Location
Progress So Far
More Progress
Changed LocationDbAdapter to Extend DbAdapter
Changed LocationDbAdapter to Extend DbAdapter
Dialog
v1 Updated - Working Commit

The LocationDialog is now working.
v2 - Finished Commit

LocationDialog complete.
Merge branch 'location-dialog-model'

Conflicts:
	bin/AndroidManifest.xml
	bin/classes/edu/miracosta/cs134/tripplanner/MainActivity.class
	bin/classes/edu/miracosta/cs134/tripplanner/R$dimen.class
	bin/classes/edu/miracosta/cs134/tripplanner/R$drawable.class
	bin/classes/edu/miracosta/cs134/tripplanner/R$id.class
	bin/classes/edu/miracosta/cs134/tripplanner/R$layout.class
	bin/classes/edu/miracosta/cs134/tripplanner/R$menu.class
	bin/classes/edu/miracosta/cs134/tripplanner/R$string.class
	bin/classes/edu/miracosta/cs134/tripplanner/R$style.class
	bin/classes/edu/miracosta/cs134/tripplanner/R.class
	gen/edu/miracosta/cs134/tripplanner/R.java
	res/layout/activity_main.xml
	res/values/strings.xml
	src/edu/miracosta/cs134/tripplanner/DbAdapter.java
	src/edu/miracosta/cs134/tripplanner/MainActivity.java
cleanup after location merge