Added task detail view and edit view
Merge branch 'lingjun'

Conflicts:
	tpl/TaskView.html