added delete button to category-editor; added today/yesterday/month to breakdown
Merge branch 'master' into temp