Added support for displaying category totals
Changed date processing to Joda time