Removed old advanced friction model
Merge branch 'master' of https://github.com/edrumwri/Moby
Removed advanced friction model stuff; removed resting contact handler from build