Project 1: Infrastructure and Tools for Supporting Collaborative Software Engineering PIs : Prasun Dewan and John Riedl Project 2: Merging in a Collaborative Environment PI: Prasun Dewan