Merge remote-tracking branch 'giacomo/master' into terhi_giacomo

Conflicts:
	src/BsToJpsiPhiAnalysis.cc
Merge branch 'padova' into terhi_giacomo_padova

Conflicts:
	src/BsToJpsiPhiAnalysis.cc
SV fixed in PV selection
SV changed in Bd PV selection