sad
#gt-126 work 3h
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile.lock
	config/environments/development.rb