#vt-56 In Progress work 4h
#vt-56 In Progress work 4h
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	db/schema.rb