DEV-21346
Merge branch 'master' of https://github.com/Unact/Market

conflict: schema.rb