Add static friction and tweak friction parameters
Merge branch 'master' into GP