Change options saving at logoff (into a new directory)
Merge branch 'Savil' into pre-release (options persistency)