modified:   fedtask/views.py
	modified:   templates/fedtask/task_base.html
Merge branch 'master' of https://github.com/jiyinhe/fedweb_ui