Changed update_adsm_from_git to simple set a flag and open an info modal.  #240  Deleted settings db.
Minor: fixed false complete status on Disease.
Readme added line about resetting a bad merge.
Merge branch 'master' into Windows