syncing
Merge branch '7XRelease' of github.com:Sam-Harper/usercode into 7XRelease

Conflicts:
	SHNtupliser/src/SHEventHelper.cc