config.xml fix: 126 rpm motor encoder added
Merge branch 'master' into encodersInDegrees
Merge branch 'encodersInDegrees' of git://github.com/romankurbatov/trikRuntime

Conflicts:
	trikControl/config.xml