Update
Remove accidental commit of spree assets
Merge branch 'staging'