Conflicts:
	source/road/Road.h
	source/road/SplineBase.cpp