Sprint 2 Merge cleanups

Lost some strings and DbAdapter in the merge, replaced them. project
does not compile because of missing Location class that is used as a
parameter.