Merge branch 'development'
Merge branch 'development'
Update settings feature