- modified the way that display_name works
Merge branch 'watg' of github.com:watg/spree into watg