'merged' from old svn dir
Fixed build errors
removed unused libs / non-optimal solvers
removed unused classes