Merging
Merge remote-tracking branch 'origin/master'

Conflicts:
	GameEngine/commands.txt
	GameEngine/src/com/javagameengine/TestGame.java
	GameEngine/src/com/javagameengine/gui/GUIcomponent.java
	GameEngine/src/com/javagameengine/renderer/Renderer.java