Merge branch 'wifi_clean' into 'master'

Wi-Fi callback mechanism

See merge request simgrid/simgrid!118

diff --cc MANIFEST.in
Simple merge

diff --cc src/kernel/lmm/System.cpp
Simple merge

diff --cc src/kernel/lmm/System.hpp
Simple merge

diff --cc src/surf/network_cm02.cpp
Simple merge

diff --cc tools/cmake/DefinePackages.cmake
Simple merge