Merge branch 'master' into add_effect_engine

Conflicts:
	include/hyperion/Hyperion.h
	libsrc/hyperion/Hyperion.cpp
	libsrc/jsonserver/JsonClientConnection.cpp

Former-commit-id: 1df163d1880691ded2fc8b5902c6ad3501912c48

include/hyperion/ColorTransform.h

@@ -0,0 +1,26 @@
+#pragma once
+
+// STL includes
+#include <string>
+
+// Utils includes
+#include <utils/RgbChannelTransform.h>
+#include <utils/HsvTransform.h>
+
+class ColorTransform
+{
+public:
+
+	/// Unique identifier for this color transform
+	std::string _id;
+
+	/// The RED-Channel (RGB) transform
+	RgbChannelTransform _rgbRedTransform;
+	/// The GREEN-Channel (RGB) transform
+	RgbChannelTransform _rgbGreenTransform;
+	/// The BLUE-Channel (RGB) transform
+	RgbChannelTransform _rgbBlueTransform;
+
+	/// The HSV Transform for applying Saturation and Value transforms
+	HsvTransform _hsvTransform;
+};