Merge branch 'updateJpsiUpsilon' into 'master'

Event/xAOD/xAODBPhys/CMakeLists.txt

Event/xAOD/xAODBPhys/Root/BPhysHelper.cxx

Event/xAOD/xAODBPhys/Root/BPhysHypoHelper.cxx

Event/xAOD/xAODBPhys/Root/BPhysMetaDataHelper.cxx

Event/xAOD/xAODBPhys/xAODBPhys/BPhysHelper.h

Event/xAOD/xAODBPhys/xAODBPhys/BPhysHypoHelper.h

Event/xAOD/xAODBPhys/xAODBPhys/BPhysMetaDataHelper.h

PhysicsAnalysis/JpsiUpsilonTools/CMakeLists.txt

...ysis/JpsiUpsilonTools/JpsiUpsilonTools/ICandidateSearch.h

...ysis/JpsiUpsilonTools/JpsiUpsilonTools/JpsiEEAlg.h_ignore

.../JpsiUpsilonTools/JpsiUpsilonTools/JpsiEEExample.h_ignore

...s/JpsiUpsilonTools/JpsiUpsilonTools/JpsiEEFinder.h_ignore

...csAnalysis/JpsiUpsilonTools/JpsiUpsilonTools/JpsiFinder.h

...nalysis/JpsiUpsilonTools/JpsiUpsilonTools/JpsiFinder_ee.h

...iUpsilonTools/JpsiUpsilonTools/JpsiJpsiEEExample.h_ignore

...alysis/JpsiUpsilonTools/JpsiUpsilonTools/JpsiPlus1Track.h

...lysis/JpsiUpsilonTools/JpsiUpsilonTools/JpsiPlus2Tracks.h

...sis/JpsiUpsilonTools/JpsiUpsilonTools/JpsiUpsilonCommon.h

PhysicsAnalysis/JpsiUpsilonTools/share/configureServices.py

PhysicsAnalysis/JpsiUpsilonTools/src/JpsiEEAlg.cxx_noCompile