Add null checks, combine contacts, and prevent duplicates
add ability to sort list model
about to merge in stuff from andrew
merge in hartman + add battery indicator
Andy G. Comments
Merge pull request #37 from travisreed-wf/nov23

Nov23