Ensure order decorator is required, fix test fragility
Reverse unintentional changes to database.yml and db/schema.rb
Merge branch 'master' into supplied-active-products-on-hand