dijkstra uses option types
Merge branch 'engine_dev' of https://github.com/GL-MPRI-2014/GL_MPRI_2014 into engine_dev

Conflicts:
	src/common/Pathfinder.ml