Bug fix
Merge origin/master
Buttons "New","Open","Save as"  bugs fix
Merge origin/master