QSettings is now used to restore the geometry of the main window
Merge branch 'feature14' into dev