Upgrade master to Rails 5#40

bark-cmcdonald wants to merge 5 commits intomasterbarkbox/shopping:masterfrom

rails_5barkbox/shopping:rails_5Copy head branch name to clipboard