* Basic TaskView
* Minor changes to TaskListView
* Merging branches