merge conflict
Merge branch 'master' of https://github.com/TrulsHaraldsson/Helix.git

Conflicts:
	Helix/src/test/JGRenderSystem.java