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

Conflicts:
	javaprolog/src/planner/GibbsPlanner.java
Fixed merge.Merge branch 'master' of https://github.com/Ramqvist/shrdlite-template

Conflicts:
	javaprolog/src/Shrdlite.java
	javaprolog/src/planner/StochasticPlanner.java