Conflicts:
	Apps/SandBox/tilings.cpp
	Apps/SandBox/tilings.h
	include/Algo/Import/import2tablesVolume.hpp
	include/Algo/Import/importMSH.hpp
	include/Algo/Import/importNAS.hpp
	include/Algo/Import/importVBGZ.hpp
	include/Algo/Import/importVTU.hpp
	include/Algo/Modelisation/planeCutting.hpp
	include/Algo/Modelisation/tetrahedralization.hpp