Stupid implementation of braking. (better leave it for box2d).
Merge remote-tracking branch 'origin/master'