Conflicts:
	CMakeLists.txt
	Simulation.h
	routing/CognitiveMapRouter.cpp
	routing/CognitiveMapRouter.h
	routing/cognitive_map/CognitiveMap.cpp
	routing/cognitive_map/CognitiveMap.h
	routing/cognitive_map/CognitiveMapStorage.cpp
	routing/cognitive_map/NavigationGraph.cpp
	routing/cognitive_map/navigation_graph/GraphEdge.cpp
	routing/cognitive_map/navigation_graph/GraphVertex.cpp
	routing/cognitive_map/navigation_graph/GraphVertex.h
	routing/cognitive_map/sensor/RoomToFloorSensor.cpp
	routing/cognitive_map/sensor/SensorManager.cpp
	routing/cognitive_map/sensor/SensorManager.h