These two volumes contain the proceedings of the plenary rapporteur talks of interest to the high energy physics community and parallel session papers that describe current research results and plans for future work.