shit !

Signed-off-by: quan <quan@lequana2>
Merge remote-tracking branch 'origin/master'

Conflicts:
	out/gcc-debug/src/core/core.o
	out/gcc-debug/src/core/net/ip/ipPacket_m.o
	out/gcc-debug/src/core/rpl/rpl.o
	out/gcc-debug/src/world/enviroment.o
	out/gcc-debug/src/wsn-energy
	simulations/results/General-0.sca
	src/core/net/ip/ipPacket_m.cc
	src/core/net/ip/ipPacket_m.h
	src/core/rpl/rpl.cc
	src/world/enviroment.cc
	src/wsn-energy