refix
cluster

Conflicts:
	src/problemSolver/statemanager/StateManager.java