Merge remote-tracking branch 'ms/develop' into ribf113

Conflicts:
	.gitignore
	artemislogon.C
	conf/map/coin/coin.map
	conf/map/dia/dia_qtc.map
	conf/map/dia/dia_timing.map
	conf/map/plastic/spla_qtc.map
	conf/map/plastic/spla_tref.map
	conf/map/ppac/ppac.map
	conf/map/si/si.map
	hist/bld/chk.yaml
	hist/bld/mwdc/dc31.yaml
	hist/bld/mwdc/dc32.yaml
	hist/bld/mwdc/dc71.yaml
	hist/bld/mwdc/dc72.yaml
	hist/bld/mwdc/dc91.yaml
	hist/bld/mwdc/dcx1.yaml
	hist/bld/mwdc/dcx2.yaml
	hist/dia/dia.yaml
	mapper.conf
	prm/mwdc/config/T20_half.yaml
	prm/mwdc/config/type_b.yaml
	prm/mwdc/config/type_c.yaml
	prm/mwdc/config/type_d.yaml
	prm/plastic/spla_ch2ns.dat
	prm/plastic/tref_ch2ns.dat
	prm/ppac/ch2ns.prm
	prm/ppac/ppac.prm.yaml
	src/TSimpleDataMappingProcessor.cc
	src/linkdef_user.h
	src/makefile
	steering/dia/v1290_tref.yaml