Replace gsettings configuration
Fix merge
Merge pull request #1 from guadalinexv9-team/devel

Devel