Flare effects and openGL query objects added
Merge branch 'master' of
https://github.com/ClairaLyrae/JavaGameEngine.git

Conflicts:
	GameEngine/commands.txt
	GameEngine/src/com/javagameengine/TestGame.java
	GameEngine/src/com/javagameengine/scene/component/LaserShot.java