Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn

Conflicts:
	Escape-the-Dawn/Escape-the-Dawn.vcxproj
	Escape-the-Dawn/Escape-the-Dawn.vcxproj.filters

Escape-the-Dawn/Escape-the-Dawn.vcxproj

@@ -98,10 +98,16 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="Engine.h" />
+    <ClCompile Include="Frame.cpp" />
+    <ClCompile Include="GameFrame.cpp" />
+    <ClCompile Include="GUIManager.cpp" />
+    <ClCompile Include="MenuFrame.cpp" />
     <ClCompile Include="Model.cpp" />
-    <ClCompile Include="Renderer\Renderer.cpp" />
+    <ClCompile Include="Renderer.cpp" />
+    <ClCompile Include="ShaderProgram.cpp" />
     <ClCompile Include="Systems\CollisionSystem.cpp" />
     <ClCompile Include="Texture.cpp" />
+    <ClCompile Include="TextFrame.cpp" />
     <ClCompile Include="World.cpp" />
     <ClCompile Include="Systems\InputSystem.cpp" />
     <ClCompile Include="Systems\LevelGenerationSystem.cpp" />
@@ -111,7 +117,6 @@
     <ClCompile Include="Systems\SoundsSystem.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="AABB.h" />
     <ClInclude Include="Color.h" />
     <ClInclude Include="Component.h" />
     <ClInclude Include="Components\Camera.h" />
@@ -130,8 +135,12 @@
     <ClInclude Include="Components\Template.h" />
     <ClInclude Include="Components\Transform.h" />
     <ClInclude Include="Entity.h" />
+    <ClInclude Include="Frame.h" />
+    <ClInclude Include="GameFrame.h" />
+    <ClInclude Include="GUIManager.h" />
     <ClInclude Include="logging.h" />
     <ClInclude Include="glerror.h" />
+    <ClInclude Include="MenuFrame.h" />
     <ClInclude Include="Model.h" />
     <ClInclude Include="Renderer.h" />
     <ClInclude Include="ShaderProgram.h" />
@@ -144,6 +153,7 @@
     <ClInclude Include="Systems\RenderSystem.h" />
     <ClInclude Include="Systems\SoundSystem.h" />
     <ClInclude Include="Texture.h" />
+    <ClInclude Include="TextFrame.h" />
     <ClInclude Include="World.h" />
   </ItemGroup>
   <ItemGroup>