*
Merge branch 'master' of https://github.com/pmaanen/gammagamma

Conflicts:
	include/DetectorConstruction.hh
	src/DetectorConstruction.cc
	src/DetectorMessenger.cc
Added physlist