Merge branch 'TEST'
Merge branch 'TEST'
Merge branch 'master' of https://github.com/siteadmin/SITE into develop-watson
CCDA web service prototype
POC version of CCDA service without MU2 capability
"Working" version of CCDA web service. Still need to add performance info and second WAR
"Working" version of CCDA web service. Still need to incorporate second
WAR and performance data
CCDA web service with performance object
Changed Spring version from 3.1.1 to 3.0.0 to prepare for introduction
of StatisticsManager
Added Statistics Manager to CCDA service
Added logging and JSON return values for errors
CCDA web service -- prep for merge