Changes to SettingsLegalActivity
fixed merge conflicts
updated General Settings to include Ringtone