replaced dashes with x as delimiter in report id.
Merge pull request #296 from stopfstedt/feat295

replaced dashes with x as delimiter in report id.
Merge branch 'master' of github.com:ilios/ilios into ready_to_update_group_and_cohort_models