Conflicts:
	include/Topology/map/embeddedMap2.h
	include/Topology/map/map1.hpp
	include/Topology/map/map2.h
	src/Topology/map/embeddedMap2.cpp
	src/Topology/map/embeddedMap3.cpp
	src/Topology/map/map2.cpp
	src/Topology/map/map3.cpp