Add mentor field
Add support for a task-specific mentor
Merge branch 'add_mentor_facet'