Add null checks, combine contacts, and prevent duplicates
add ability to sort list model
Merge pull request #36 from Hartman2/master

November 17th
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
Settings: Status deleted
		  Preview message added (not functional yet)

Separated conversation and small chat font size settings

settings added to conversation

contact list settings enlarged
notification on/off setting wired up.