Merge remote-tracking branch 'origin/master'

Conflicts:
	CARS/PIDControllerSR.cpp
	CARS/PIDControllerSR.h
	CARS/definitions.h