L/R Haptic forces
Merge remote-tracking branch 'origin/master'

Conflicts:
	codeBase/bin/Trainer.exe
	codeBase/src/main.cpp