Conflicts:
	casadi/interfaces/ipopt/ipopt_internal.cpp
	casadi/nonlinear_programming/scpgen_internal.cpp
	casadi/nonlinear_programming/sqp_internal.cpp
	casadi/nonlinear_programming/stabilized_sqp_internal.cpp
#1131 Some cleanup
#1131 Plugin support for ImplicitFunction
#1131 Plugin support for SDPSolver
#1131 Updated QPOases
#1131 Damn you linter