edrgfdfg
Merge remote-tracking branch 'remotes/origin/Windows' into CarlH

Conflicts:
	Breakout/Breakout/Breakout.vcxproj
	Breakout/Breakout/ComponentSystem/EntityFactory.cpp
	Breakout/Breakout/ComponentSystem/System/PhysicsSystem.cpp
openGL 2D texture fix
WHAT?!  Merge branch 'Linux' of https://github.com/CarlRapp/Agile into Linux

Conflicts:
	Breakout/Breakout/Graphics/OpenGL/GLShaders/standard_vertex.glsl
New models, DEAL WITH it
Merge branch 'Windows' of https://github.com/CarlRapp/Agile into Windows
Removed unused files
Merge branch 'Windows' of https://github.com/CarlRapp/Agile into Windows
Hotfix new model
Merge branch 'Windows' into Erik
Added material files to all obj files
Merge branch 'Windows' of https://github.com/CarlRapp/Agile into Windows
Merge branch 'Windows' into Erik
bla
Merge branch 'Windows' of https://github.com/CarlRapp/Agile into Windows
Merge branch 'Linux' of https://github.com/CarlRapp/Agile into Linux

Conflicts:
	Breakout/Breakout/Graphics/OpenGL/GLGraphics.cpp
Merge branch 'Linux' of https://github.com/CarlRapp/Agile into Linux

Conflicts:
	Breakout/Breakout/ComponentSystem/System/ModelSystem.cpp
	Breakout/Breakout/Graphics/OpenGL/GLShaders/explode_geometry.glsl
ghjtghj
Merge remote-tracking branch 'remotes/origin/Windows' into CarlH

Conflicts:
	Breakout/Breakout/Breakout.vcxproj
	Breakout/Breakout/ComponentSystem/EntityFactory.cpp
	Breakout/Breakout/ComponentSystem/System/PhysicsSystem.cpp
	Breakout/Breakout/Scenes/GameScene.cpp
OpenGL textures (with artifacts)
 Merge branch 'Linux' of https://github.com/CarlRapp/Agile into Linux

Conflicts:
	Breakout/Breakout/ComponentSystem/System/ModelSystem.cpp