Added dashboard to the task page
Merge remote-tracking branch 'origin/master'