Fixed the conflict between Predictor-Corrector method and frictional contact model.
Merge remote-tracking branch 'origin/master'