ContactMap: added weights and parallelisation
rt28: reset
ContantMap changes
Merge branch 'v2.1'