Merge branch 'mc'

Conflicts:
	src/mc/mc_compare.cpp

diff --cc buildtools/Cmake/AddTests.cmake
Simple merge

diff --cc buildtools/Cmake/Flags.cmake
Simple merge

diff --cc src/mc/mc_compare.cpp
Simple merge

diff --cc src/mc/mc_global.c
Simple merge

diff --cc src/simgrid/sg_config.c
Simple merge