Put geant build back in; add rfluka patch
Update project names
Intermediate checkin