Conflicts:
	Examples/LagrangeInterpolationFMM.cpp
	Obsolete/Adaptive/FAbstractAdaptiveKernel.hpp
	Obsolete/Adaptive/FAdaptChebSymKernel.hpp
	Obsolete/Adaptive/FAdaptTools.hpp
	Obsolete/Adaptive/FAdaptUnifKernel.hpp
	Obsolete/Adaptive/FAdaptiveCell.hpp
	Obsolete/Adaptive/FAdaptiveKernelWrapper.hpp
	Obsolete/Adaptive/FAdaptivePrintKernel.hpp
	Obsolete/Adaptive/FAdaptiveTestKernel.hpp
	Obsolete/BalanceTree/FChebSymCostKernel.hpp
	Obsolete/BalanceTree/FDumbCostKernel.hpp
	Obsolete/testAdaptiveChebSymFMM.cpp
	Obsolete/testAdaptiveChebSymFMMDebug.cpp
	Obsolete/testAdaptiveUnifFMM.cpp
	Obsolete/testFmmAdaptiveAlgorithm.cpp
	Obsolete/testFmmAdaptiveAlgorithmAdvanced.cpp
	Obsolete/testFmmAdaptiveStats.cpp
	Obsolete/testFmmAlgorithmBalanced.cpp
	Obsolete/testSmallCase.cpp
	Obsolete/utestChebyshevAdaptative.cpp
	Src/Components/FAbstractKernels.hpp
	Src/Components/FBasicParticleContainer.hpp
	Src/Components/FTestCell.hpp
	Src/Components/FTestKernels.hpp
	Src/Containers/FVector.hpp
	Src/Core/FFmmAlgorithmSectionTask.hpp
	Src/Core/FFmmAlgorithmTask.hpp
	Src/Core/FFmmAlgorithmThreadProcPeriodic.hpp
	Src/Core/FFmmAlgorithmThreadTsm.hpp
	Src/Core/FFmmAlgorithmTsm.hpp
	Src/GroupTree/Core/FGroupTaskStarpuAlgorithm.hpp
	Src/GroupTree/StarPUUtils/FOmpPriorities.hpp
	Src/Kernels/Chebyshev/FAbstractChebKernel.hpp
	Src/Kernels/Chebyshev/FChebFlopsSymKernel.hpp
	Src/Kernels/Chebyshev/FChebKernel.hpp
	Src/Kernels/Chebyshev/FChebM2LHandler.hpp
	Src/Kernels/Chebyshev/FChebSymM2LHandler.hpp
	Src/Kernels/Chebyshev/FChebTensorialKernel.hpp
	Src/Kernels/Interpolation/FInterpMapping.hpp
	Src/Kernels/Rotation/FRotationCell.hpp
	Src/Kernels/Spherical/FSphericalBlockBlasKernel.hpp
	Src/Kernels/Spherical/FSphericalCell.hpp
	Src/Kernels/Taylor/FTaylorCell.hpp
	Src/Kernels/Taylor/FTaylorKernel.hpp
	Src/Kernels/Uniform/FUnifInterpolator.hpp
	Src/Kernels/Uniform/FUnifM2LHandler.hpp
	Src/Utils/FDft.hpp
	Src/Utils/FSmartPointer.hpp
	Tests/GroupTree/testBlockedMpiAlgorithm.cpp
	Tests/Kernels/testSphericalProcAlgorithm.cpp
	Tests/Utils/testCompareIOTree.cpp
	Tests/Utils/testFmmAlgorithmPeriodic.cpp
	Tests/Utils/testFmmAlgorithmProc.cpp
	Tests/Utils/testOctreeRearrangeProc.cpp
	UTests/utestLagrange.cpp
	UTests/utestMpiTreeBuilder.cpp