Adding taskUsage
Merge branch 'master' of https://github.com/worthwhile/django_dash_2013
Fixing migration conflict