restore and default editors for default file and .txt files
restore and default editors for default file and .txt files
Merge remote-tracking branch 'origin/master'