Updated tasks show view
Merge branch 'master' into alyssa