- addtask revisited
- addtask revisited

Conflicts:
	PWGGA/GammaConv/macros/AddTask_GammaConvV1_PbPb.C

alisw/AliPhysics,rderradi/AliPhysics,jgronefe/AliPhysics,pchrista/AliPhysics,btrzecia/AliPhysics,akubera/AliPhysics,pchrista/AliPhysics,ALICEHLT/AliPhysics,lfeldkam/AliPhysics,mvala/AliPhysics,hcab14/AliPhysics,carstooon/AliPhysics,preghenella/AliPhysics,amaringarcia/AliPhysics,rderradi/AliPhysics,fcolamar/AliPhysics,AMechler/AliPhysics,mbjadhav/AliPhysics,yowatana/AliPhysics,kreisl/AliPhysics,ppribeli/AliPhysics,mazimm/AliPhysics,SHornung1/AliPhysics,kreisl/AliPhysics,mpuccio/AliPhysics,btrzecia/AliPhysics,victor-gonzalez/AliPhysics,hcab14/AliPhysics,rihanphys/AliPhysics,rihanphys/AliPhysics,preghenella/AliPhysics,kreisl/AliPhysics,ALICEHLT/AliPhysics,rihanphys/AliPhysics,ALICEHLT/AliPhysics,mvala/AliPhysics,yowatana/AliPhysics,rderradi/AliPhysics,ALICEHLT/AliPhysics,fbellini/AliPhysics,rbailhac/AliPhysics,fbellini/AliPhysics,dlodato/AliPhysics,mbjadhav/AliPhysics,mbjadhav/AliPhysics,amatyja/AliPhysics,AMechler/AliPhysics,dlodato/AliPhysics,ALICEHLT/AliPhysics,mpuccio/AliPhysics,mpuccio/AliPhysics,lfeldkam/AliPhysics,rihanphys/AliPhysics,jgronefe/AliPhysics,victor-gonzalez/AliPhysics,pbuehler/AliPhysics,adriansev/AliPhysics,aaniin/AliPhysics,dstocco/AliPhysics,jgronefe/AliPhysics,pbatzing/AliPhysics,sebaleh/AliPhysics,SHornung1/AliPhysics,dmuhlhei/AliPhysics,ppribeli/AliPhysics,AMechler/AliPhysics,aaniin/AliPhysics,fcolamar/AliPhysics,aaniin/AliPhysics,pbatzing/AliPhysics,aaniin/AliPhysics,AudreyFrancisco/AliPhysics,mkrzewic/AliPhysics,yowatana/AliPhysics,carstooon/AliPhysics,amatyja/AliPhysics,lfeldkam/AliPhysics,nschmidtALICE/AliPhysics,sebaleh/AliPhysics,rbailhac/AliPhysics,dmuhlhei/AliPhysics,kreisl/AliPhysics,dstocco/AliPhysics,amatyja/AliPhysics,nschmidtALICE/AliPhysics,pchrista/AliPhysics,AMechler/AliPhysics,pchrista/AliPhysics,alisw/AliPhysics,hcab14/AliPhysics,rbailhac/AliPhysics,lcunquei/AliPhysics,AudreyFrancisco/AliPhysics,mkrzewic/AliPhysics,kreisl/AliPhysics,AMechler/AliPhysics,amatyja/AliPhysics,btrzecia/AliPhysics,hcab14/AliPhysics,pbuehler/AliPhysics,rderradi/AliPhysics,rihanphys/AliPhysics,ALICEHLT/AliPhysics,pbuehler/AliPhysics,adriansev/AliPhysics,rbailhac/AliPhysics,victor-gonzalez/AliPhysics,AudreyFrancisco/AliPhysics,alisw/AliPhysics,mbjadhav/AliPhysics,pbatzing/AliPhysics,lfeldkam/AliPhysics,akubera/AliPhysics,jmargutt/AliPhysics,mkrzewic/AliPhysics,preghenella/AliPhysics,btrzecia/AliPhysics,dstocco/AliPhysics,carstooon/AliPhysics,adriansev/AliPhysics,rderradi/AliPhysics,ppribeli/AliPhysics,yowatana/AliPhysics,sebaleh/AliPhysics,amaringarcia/AliPhysics,amaringarcia/AliPhysics,AudreyFrancisco/AliPhysics,sebaleh/AliPhysics,preghenella/AliPhysics,nschmidtALICE/AliPhysics,nschmidtALICE/AliPhysics,adriansev/AliPhysics,kreisl/AliPhysics,aaniin/AliPhysics,hzanoli/AliPhysics,fcolamar/AliPhysics,hcab14/AliPhysics,sebaleh/AliPhysics,carstooon/AliPhysics,fbellini/AliPhysics,dstocco/AliPhysics,btrzecia/AliPhysics,adriansev/AliPhysics,alisw/AliPhysics,sebaleh/AliPhysics,jmargutt/AliPhysics,mkrzewic/AliPhysics,SHornung1/AliPhysics,mpuccio/AliPhysics,fbellini/AliPhysics,btrzecia/AliPhysics,victor-gonzalez/AliPhysics,hcab14/AliPhysics,rbailhac/AliPhysics,fbellini/AliPhysics,dmuhlhei/AliPhysics,dlodato/AliPhysics,AMechler/AliPhysics,sebaleh/AliPhysics,hzanoli/AliPhysics,mvala/AliPhysics,victor-gonzalez/AliPhysics,mpuccio/AliPhysics,yowatana/AliPhysics,yowatana/AliPhysics,pbatzing/AliPhysics,victor-gonzalez/AliPhysics,fbellini/AliPhysics,jgronefe/AliPhysics,amatyja/AliPhysics,jgronefe/AliPhysics,jgronefe/AliPhysics,hzanoli/AliPhysics,pbuehler/AliPhysics,ppribeli/AliPhysics,mazimm/AliPhysics,dlodato/AliPhysics,fcolamar/AliPhysics,hzanoli/AliPhysics,SHornung1/AliPhysics,dlodato/AliPhysics,rihanphys/AliPhysics,carstooon/AliPhysics,lfeldkam/AliPhysics,yowatana/AliPhysics,mazimm/AliPhysics,mvala/AliPhysics,AudreyFrancisco/AliPhysics,hzanoli/AliPhysics,preghenella/AliPhysics,amaringarcia/AliPhysics,victor-gonzalez/AliPhysics,lcunquei/AliPhysics,AMechler/AliPhysics,akubera/AliPhysics,amaringarcia/AliPhysics,preghenella/AliPhysics,ppribeli/AliPhysics,mazimm/AliPhysics,dmuhlhei/AliPhysics,ppribeli/AliPhysics,mbjadhav/AliPhysics,mbjadhav/AliPhysics,fcolamar/AliPhysics,alisw/AliPhysics,jmargutt/AliPhysics,amatyja/AliPhysics,nschmidtALICE/AliPhysics,dstocco/AliPhysics,dmuhlhei/AliPhysics,aaniin/AliPhysics,lcunquei/AliPhysics,carstooon/AliPhysics,pchrista/AliPhysics,pbatzing/AliPhysics,dmuhlhei/AliPhysics,preghenella/AliPhysics,mpuccio/AliPhysics,SHornung1/AliPhysics,mazimm/AliPhysics,pbuehler/AliPhysics,akubera/AliPhysics,akubera/AliPhysics,dstocco/AliPhysics,fbellini/AliPhysics,mazimm/AliPhysics,jmargutt/AliPhysics,dstocco/AliPhysics,adriansev/AliPhysics,btrzecia/AliPhysics,rbailhac/AliPhysics,mkrzewic/AliPhysics,pbatzing/AliPhysics,ALICEHLT/AliPhysics,amatyja/AliPhysics,amaringarcia/AliPhysics,lfeldkam/AliPhysics,pchrista/AliPhysics,jmargutt/AliPhysics,mvala/AliPhysics,pbatzing/AliPhysics,AudreyFrancisco/AliPhysics,akubera/AliPhysics,fcolamar/AliPhysics,SHornung1/AliPhysics,nschmidtALICE/AliPhysics,mazimm/AliPhysics,adriansev/AliPhysics,lcunquei/AliPhysics,mbjadhav/AliPhysics,alisw/AliPhysics,dlodato/AliPhysics,ppribeli/AliPhysics,mvala/AliPhysics,dmuhlhei/AliPhysics,carstooon/AliPhysics,lcunquei/AliPhysics,aaniin/AliPhysics,hzanoli/AliPhysics,alisw/AliPhysics,rderradi/AliPhysics,jgronefe/AliPhysics,hcab14/AliPhysics,AudreyFrancisco/AliPhysics,nschmidtALICE/AliPhysics,hzanoli/AliPhysics,rderradi/AliPhysics,SHornung1/AliPhysics,rihanphys/AliPhysics,pbuehler/AliPhysics,jmargutt/AliPhysics,mvala/AliPhysics,rbailhac/AliPhysics,akubera/AliPhysics,pbuehler/AliPhysics,lcunquei/AliPhysics,pchrista/AliPhysics,mpuccio/AliPhysics,lfeldkam/AliPhysics,mkrzewic/AliPhysics,jmargutt/AliPhysics,fcolamar/AliPhysics,lcunquei/AliPhysics,dlodato/AliPhysics,kreisl/AliPhysics,mkrzewic/AliPhysics,amaringarcia/AliPhysics