Merge branch 'master' into solid_lgc

	modified:   ../../CMakeLists.txt
	new file:   ../../beamline/compact/crab_example.xml
	new file:   ../../beamline/src/crab_geo.cpp
1 job for solid_lgc in 43 seconds