Develop sqlite database settings
Merge branch 'database-settings' into develop