Merge branch 'TCDSchanges'

Conflicts:
	include/evb/readoutunit/Input.h
	include/evb/version.h
	test/cases/2x1_corruptedEvent/controlScript.template.sh