Merge branch 'master' into develop

Conflicts:
	.cproject
	.settings/language.settings.xml
	CMakeLists.txt
	examples/simple_system/gpio.cpp
	examples/simple_system/plic.cpp
	sc-components

tests/sim_performance/pkt_switch.cpp

@@ -10,7 +10,6 @@
 #endif
 #include "pkt_switch.h"
 #include "types.h"
-#include <tlm/tlm_mm.h>
 #include <scc/report.h>
 
 using namespace sc_core;