Fixed merge-error in check-DatabaseHandler.
Small edits in SettingsManager.
Merge branch 'master' of https://github.com/MakersThn/systemet