Linked admin_task module
Removing db file from git cache
Changed tasks display with color support
Merge branch 'feature/admin_task' into develop
Merge branch 'develop'
Merge branch 'master' of github.com:harmo/tracker

Conflicts:
	tracker.db