Merge branch 'master' into TPCdev

Conflicts:
	PWGPP/AliAnalysisTaskFilteredTree.cxx
	PWGPP/AliAnalysisTaskFilteredTree.h
	PWGPP/TRD/AliTRDcheckTRK.cxx
	STEER/CDB/AliCDBManager.cxx
	STEER/STEERBase/AliLog.cxx
	TPC/Rec/AliTPCRecoParam.cxx
	TPC/Rec/AliTPCRecoParam.h
	TPC/Rec/AliTPCtrack.cxx
	TPC/Rec/AliTPCtracker.cxx
	TPC/Sim/AliTPCDigitizer.cxx
	TRD/AliTRDseedV1.cxx
	TRD/AliTRDseedV1.h
	TRD/AliTRDtrackerV1.cxx

Unmerged paths:
        both modified:      PWGPP/AliAnalysisTaskFilteredTree.cxx
            git checkout --ours PWGPP/AliAnalysisTaskFilteredTree.cxx
        both modified:      PWGPP/AliAnalysisTaskFilteredTree.h
            git checkout --ours PWGPP/AliAnalysisTaskFilteredTree.h
        both modified:      PWGPP/TRD/AliTRDcheckTRK.cxx            -
            git checkout  --theirs PWGPP/TRD/AliTRDcheckTRK.cxx

        both modified:      STEER/CDB/AliCDBManager.cxx
	    git checkout --theirs  STEER/CDB/AliCDBManager.cxx
        both modified:      STEER/STEERBase/AliLog.cxx
            git checkout --ours  STEER/STEERBase/AliLog.cxx

        both modified:      TPC/Rec/AliTPCRecoParam.cxx
            git checkout --theirs TPC/Rec/AliTPCRecoParam.cxx
        both modified:      TPC/Rec/AliTPCRecoParam.h
            git checkout --theirs TPC/Rec/AliTPCRecoParam.h

        both modified:      TPC/Rec/AliTPCtrack.cxx
            git checkout --theirs  TPC/Rec/AliTPCtrack.cxx
        both modified:      TPC/Rec/AliTPCtracker.cxx
            git checkout --ours  TPC/Rec/AliTPCtracker.cxx
        both modified:      TPC/Sim/AliTPCDigitizer.cxx
	    git checkout --ours  TPC/Sim/AliTPCDigitizer.cxx

        both modified:      TRD/AliTRDseedV1.cxx
	    git checkout --theirs TRD/AliTRDseedV1.cxx
        both modified:      TRD/AliTRDseedV1.h
            git checkout --theirs TRD/AliTRDseedV1.h
        both modified:      TRD/AliTRDtrackerV1.cxx
	     git checkout --theirs TRD/AliTRDtrackerV1.cxx