More fixing.
Merge branch 'master' of https://github.com/Ramqvist/shrdlite-template

Conflicts:
	javaprolog/src/Debug.java