Branched refactoring effort

git-svn-id: http://jules.aerix.nl/svn/g-key/branches/refactor@243 f5aa9b1c-f3d2-43f6-b11e-4419a1f85e2c
Refactor settings database


git-svn-id: http://jules.aerix.nl/svn/g-key/branches/refactor@244 f5aa9b1c-f3d2-43f6-b11e-4419a1f85e2c