Merge branch 'release-1.1.0'
Updated urbuses_settings.*