Merge branch 'master' into directx

Conflicts:
	include/Core/Engine.h

include/GUI/Button.h

@@ -75,6 +75,10 @@ protected:
 			Events::ButtonEnter e;
 			e.FrameName = m_Name;
 			EventBroker->Publish(e);
+			Events::PlaySound soundEvent;
+			soundEvent.FilePath = "Sounds/GUI/hover-n.wav";
+			EventBroker->Publish(soundEvent);
+			
 		} else if (!isOver && m_MouseIsOver) { // Leave
 			if (!m_IsDown) {
 				if (!m_TextureReleased.empty()) {

include/GUI/Slider.h

@@ -7,6 +7,7 @@
 #include "GUI/EButtonRelease.h"
 #include "GUI/ESliderUpdate.h"
 #include "Core/EMouseMove.h"
+#include "Sound/EPlaySound.h"
 
 namespace dd
 {
@@ -79,6 +80,11 @@ private:
 		if (event.Button == m_SliderButton) {
 			m_IsGrabbed = true;
 		}
+		else {
+			Events::PlaySound e;
+			e.FilePath = "Sounds/GUI/click-n.wav";
+			EventBroker->Publish(e);
+		}
 
 		return true;
 	}

include/GUI/TextureFrame.h

@@ -62,6 +62,7 @@ public:
 		if (m_Texture == nullptr) {
 			m_Texture = ResourceManager::Load<dd::Texture>("Textures/Core/ErrorTexture.png");
 		}
+
 		SizeToTexture();
 	}