Resolve merge conflicts, merge #229 "Add SystemdMeter" from @cgzones

linux/Platform.c

@@ -44,6 +44,7 @@ in the source distribution for its full text.
 #include "SELinuxMeter.h"
 #include "Settings.h"
 #include "SwapMeter.h"
+#include "SystemdMeter.h"
 #include "TasksMeter.h"
 #include "UptimeMeter.h"
 #include "XUtils.h"
@@ -161,6 +162,7 @@ const MeterClass* const Platform_meterTypes[] = {
    &DiskIOMeter_class,
    &NetworkIOMeter_class,
    &SELinuxMeter_class,
+   &SystemdMeter_class,
    NULL
 };