#kd-10 work 5h
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/locales/views/ru.yml