solver och state
Merge remote-tracking branch 'origin/master'

Conflicts:
	sokoban/StatePriorityComparator.java
	solutionEvaluator/SolutionEvaluator.java
solver och state