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

Conflicts:
	Gemfile.lock