Merge commit '
045db1657e870c721be490b411868f4181a12ced' into surf++
Conflicts:
buildtools/Cmake/DefinePackages.cmake
src/include/surf/datatypes.h
src/include/surf/surf.h
src/simgrid/sg_config.c
src/simix/smx_io.c
src/simix/smx_smurf_private.h
src/surf/cpu_cas01.c
src/surf/cpu_ti.c
src/surf/network.c
src/surf/network_constant.c
src/surf/network_gtnets.c
src/surf/new_model.c
src/surf/storage.c
src/surf/storage_private.h
src/surf/surf.c
src/surf/surf_action.c
src/surf/surf_model.c
src/surf/surf_routing.cpp
src/surf/surf_routing_cluster.c
src/surf/surf_routing_floyd.cpp
src/surf/surf_routing_full.cpp
src/surf/surf_routing_none.c
src/surf/surf_routing_vivaldi.c
src/surf/workstation.c
src/surf/workstation_ptask_L07.c