reset fix
Merge remote-tracking branch 'origin/master'
app settings new fields