"user roster" and "event-project-testing" merge