Added support for XDG_CONFIG_DIR
Correction of crash on restore
Merge branch 'delehef-master' into dev
Tidy restore orientation step