Merge TEC Team 2 Features

Do a merge from the "Venture" branch as of June 5.  Solve conflicts by
letting any venture/project related aspects be trumped by TEC Team 2,
but anything else is kept as TEC Team 1.  Everything looks
fine/resembles the isolated versions, but needs to be checked by the
respective teams for details.