schema change
XMerge branch 'master' of github.com:cplopez4/spree-clean
schema change 2
Merge branch 'master' of github.com:cplopez4/spree-clean