Merge remote-tracking branch 'origin/master' into PlayerMovement

# Conflicts:
#	include/Engine/Collision/Collision.h
#	include/Engine/Collision/CollisionSystem.h
#	include/Engine/Collision/TriggerSystem.h
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/CollisionTestLevel.xml
#	resources/Schema/Types/Entity.xsd
#	src/Engine/Collision/Collision.cpp
#	src/Game/Game.cpp

include/Game/Game.h

@@ -26,6 +26,8 @@
 #include "Network/Server.h"
 #include "Network/Client.h"
 
+// Sound
+#include "Sound/SoundSystem.h"
 
 class Game
 {
@@ -57,8 +59,11 @@ private:
     Network* m_ClientOrServer;
     bool m_IsClientOrServer = false;
 
-    EventRelay<Game, Events::InputCommand> m_EInputCommand;
-    bool debugOnInputCommand(const Events::InputCommand& e);
+    // Sound
+    SoundSystem* m_SoundSystem;
+
+    //EventRelay<Game, Events::InputCommand> m_EInputCommand;
+    //bool debugOnInputCommand(const Events::InputCommand& e);
 
     void debugInitialize();
     void debugTick(double dt);