added openoakland.org and civicrm.org to projects page
included lisa's commit
fixed conflict