particle system progress
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
opengl text shader
OpenGL particle effects working
Merge branch 'Linux' of github.com:CarlRapp/Agile into Linux

Conflicts:
	Breakout/Breakout/Graphics/IGraphics.h
	Breakout/Breakout/Graphics/OpenGL/GLGraphics.cpp
	Breakout/Breakout/Graphics/OpenGL/GLGraphics.h
	Breakout/Breakout/Program.cpp
OpenGL particle effect (small adjustments)
fire3.png texture added
Merge branch 'Windows' into Linux

Conflicts:
	Breakout/Breakout/ComponentSystem/Component/TextComponent.h
	Breakout/Breakout/ComponentSystem/System/EffectSystem.cpp
	Breakout/Breakout/ComponentSystem/System/LoseLifeSystem.cpp
	Breakout/Breakout/ComponentSystem/System/RespawnBallSystem.cpp
	Breakout/Breakout/Graphics/GraphicsManager.cpp
	Breakout/Breakout/Graphics/GraphicsManager.h
	Breakout/Breakout/Graphics/IGraphics.h
	Breakout/Breakout/Scenes/GameScene.cpp
	Breakout/Breakout/Scenes/MainMenuScene.cpp
Merge branch 'Windows' of github.com:CarlRapp/Agile into Linux

Conflicts:
	Breakout/Breakout/ComponentSystem/Component/TextComponent.h
	Breakout/Breakout/ComponentSystem/System/EffectSystem.cpp
	Breakout/Breakout/ComponentSystem/System/LoseLifeSystem.cpp
	Breakout/Breakout/Graphics/GraphicsManager.cpp
	Breakout/Breakout/Graphics/GraphicsManager.h
	Breakout/Breakout/Graphics/IGraphics.h
	Breakout/Breakout/Scenes/GameScene.cpp
	Breakout/Breakout/Scenes/MainMenuScene.cpp
Merge branch 'Linux' of github.com:CarlRapp/Agile into Linux

Conflicts:
	Breakout/Breakout/ComponentSystem/System/RespawnBallSystem.cpp
Merge fix
Merge branch 'Linux' of https://github.com/CarlRapp/Agile into Linux

Conflicts:
	Breakout/Breakout/ComponentSystem/System/EffectSystem.cpp
	Breakout/Breakout/ComponentSystem/System/LoseLifeSystem.cpp
	Breakout/Breakout/ComponentSystem/System/RespawnBallSystem.cpp
	Breakout/Breakout/Graphics/GraphicsManager.cpp
	Breakout/Breakout/Graphics/GraphicsManager.h
	Breakout/Breakout/Graphics/IGraphics.h
	Breakout/Breakout/Scenes/GameScene.cpp
	Breakout/Breakout/Scenes/MainMenuScene.cpp
MERGE FIX