preparing to merge
Merge branch 'master' of https://github.com/pmaanen/gammagamma

Conflicts:
	include/DetectorConstruction.hh