Merge branch 'i20977'

Conflicts:
	config/locales/en.yml
	config/locales/ru.yml
#21707 Added logo
#21707 Forgot the styles
#21707 Remade to use partial
#21707 Made code more generic to avoid extra editing
#21707 Fixed the error
#21208 fixed. static modal
#21208 fixed. static modal
Merge branch 'master' into development

Conflicts:
	config/locales/en.yml
	config/locales/ru.yml