CONNECT-Solution/CONNECT — pull request #165 by tparnell (2012-11-14 03:13:33+00:00)
Title: Event integration merge

After merging my previous pull request, this is a straightforward merge of the CONNECT_Integration branch. The only tricky merge conflict was PatientDiscovery's cxf-servlet.xml, which needed to be pulled over to webservices.xml.