Merged QP into QuadProg++