Added ProjectRole intermediate table and fixed some minor bugs