Improvements in preferences management
Merge branch 'master' of https://github.com/KalimaSystems/KalimaCache

merge conflict