development settings
Merge branch 'hotfix/update_settings'
requirementes