#sup-42 fixed work 2h 30m
Merge remote-tracking branch 'origin/master'

Conflicts:
	db/schema.rb