#21707 Added the logo
#21707 Forgot the locales, oops
no message
Merge branch 'i21707' into development

Conflicts:
	Gemfile
	app/views/settings/_rmplus_devtools.html.erb
	config/locales/en.yml
	config/locales/ru.yml