Updating the Cat III export code to deal with measures that have multiple population types, like multiple IPPs
Merge remote-tracking branch 'cy/develop' into develop

Conflicts:
	templates/cat3/show.cat3.erb