Merge branch 'task-li-notes' into develop

Conflicts:
	views/shared/tasks/task.jade