Signed-off-by: Kai Börnert <kai-boernert@visiongamestudios.de>
Merge branch 'master' of https://github.com/empirephoenix/Hardened-Luaj

Conflicts:
	src/test/java/de/visiongamestudios/TestLongRunningTask.java
	src/test/java/de/visiongamestudios/longRunningTask.lua

Signed-off-by: Kai Börnert <kai-boernert@visiongamestudios.de>