fix position calibration
position control parameters
Merge branch 'encoder_position_estimation_test' of github.com:froj/nastya into encoder_position_estimation_test

Conflicts:
	match.c