add success/error for settings editing
Merge branch 'develop', remote-tracking branch 'origin'