#y-28 fixed work 1h
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/models/localization.rb