report generation updated
Merge branch 'watg' of github.com:watg/spree into watg