fixed error in angular controller
resolved conflicts from upstream pull
fix errors in angular controller
fixed categorize button in dashboard
Merge pull request #19 from melodicodyssey/dashboard_fix

Dashboard fix