cleaned up LCPSolver
Merge branch 'origin/master'