Conflicts:
	src/core.cpp
	src/jogaction.cpp
	src/monitor/monitor.cpp
	src/monitor/monitormanager.cpp
	src/monitor/recmonitor.cpp
	src/projectlist.cpp