Merge branch 'master' into develop

* master:
  Filtering received CAN messages due to new motor controller status messages Tweaked object detection logic to improve wall following
Version control cleanup
Fixing bug with stop-start timer not resetting all the time
Merge branch 'develop'

* develop:
  Fixing bug with stop-start timer not resetting all the time
  Version control cleanup