Added factories for Participant, Task, TaskStatus
Fixed merge conflicts