Reporter table fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	devSimulator/studies/cohort.R