#eba-6 work 4h
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile
	Gemfile.lock
for build
for build