Merge. Also fixed interpolation for scale and rotation.

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

# Conflicts:
#	include/Game/Game.h
#	src/Game/CMakeLists.txt
#	src/Game/Game.cpp

src/Game/CMakeLists.txt

@@ -10,18 +10,25 @@ include_directories(
     ${Boost_INCLUDE_DIRS}
 )
 
-file(GLOB SOURCE_FILES
-    "${INCLUDE_PATH}/*.h"
-    #"*.cpp"
+file(GLOB SOURCE_FILES_Systems
+    "${INCLUDE_PATH}/Systems/*.h"
+    "Systems/*.cpp"
 )
-#source_group(Core FILES ${SOURCE_FILES})
+source_group(Systems FILES ${SOURCE_FILES_Systems})
+
+file(GLOB SOURCE_FILES_Events
+	"${INCLUDE_PATH}/Events/*.h"
+	"Events/*.cpp"
+)
+source_group(Events FILES ${SOURCE_FILES_Events})
 
 set(SOURCE_FILES
     ${SOURCE_FILES}
     "Game.cpp"
-    "HealthSystem.cpp"
-	"PlayerSystem.cpp"
-	"InterpolationSystem.cpp"
+    ${SOURCE_FILES_Systems}
+    ${SOURCE_FILES_Events}
+
+    
 )
 
 set(LIBRARIES