Updated conflicting entries in the NLP io scheme
Merge branch 'issue_566' into develop

Conflicts:
	documentation/examples/solvers/callback.py
	documentation/tutorials/python/src/nlp/ipopt.py
	examples/cplusplus/ipopt_nl.cpp
	examples/cplusplus/multiple_shooting_from_scratch.cpp
	examples/cplusplus/nlp_codegen.cpp
	examples/cplusplus/parametric_nlp.cpp
	examples/cplusplus/parametric_sensitivities.cpp
	examples/cplusplus/reduced_hessian.cpp
	examples/cplusplus/rocket_ipopt.cpp
	examples/cplusplus/rocket_mx_and_sx.cpp
	examples/cplusplus/rocket_single_shooting.cpp
	examples/cplusplus/test_liftopt.cpp
	examples/python/biegler_10_1.py
	examples/python/dae_collocation.py
	examples/python/dae_single_shooting_in_30_lines.py
	examples/python/ipopt_nl.py
	examples/python/mhe_spring_damper.py
	examples/python/parametric_sensitivities.py
	examples/python/reduced_hessian.py
	examples/python/rocket.py
	examples/python/rosenbrock.py
	examples/python/simple_nlp.py
	examples/python/vdp_collocation.py
	examples/python/vdp_collocation2.py
	examples/python/vdp_indirect_muliple_shooting.py
	examples/python/vdp_indirect_single_shooting.py
	examples/python/vdp_multiple_shooting.py
	examples/python/vdp_single_shooting.py
	experimental/greg/python/basket_retractor.py
	experimental/greg/python/ocp_test.py
	experimental/joel/biegler_10_2.py
	experimental/joel/bug_361.py
	experimental/joel/cstr/cstr.py
	experimental/joel/ip_method/exercise_6.py
	experimental/joel/lifting_gn.py
	experimental/joel/nlp_benchmarks/clnlbeam.py
	experimental/joel/nlp_benchmarks/corkscrw.py
	experimental/joel/nlp_benchmarks/dtoc1nd.py
	experimental/joel/nlp_benchmarks/dtoc2.py
	experimental/joel/nlp_benchmarks/optmass.py
	experimental/joel/nmpc_example.py
	experimental/joel/rocket_example.py
	experimental/joel/rocket_ipopt.py
	experimental/joel/scpgen_chain_mass.py
	experimental/joel/shallow/shallow.py
	experimental/joel/sqp_method/sqp_method.py
	experimental/joel/vdp_lifted_newton.py
	experimental/joris/callback.py
	experimental/joris/estimation.py
	experimental/joris/vdp_single_shooting.py
	experimental/marnix/tutorial.py
	nonlinear_programming/scpgen_internal.cpp
	test/python/nlp.py
	test/python/ocp.py
	test/python/sdp.py
Merge branch 'develop' of github.com:casadi/casadi into develop

Conflicts:
	experimental/greg/examples/glider.cpp
	experimental/greg/examples/rocket.cpp
	experimental/joel/albersmeyer_toy_example.cpp
	experimental/joel/biegler_10_1.cpp
	experimental/joel/biegler_10_1_knitro.cpp
	experimental/joel/biegler_10_2.cpp
	experimental/joel/convection_diffusion.cpp
	experimental/joel/shallow_water.cpp
	experimental/joel/simple_ocp_sequential.cpp
	experimental/joel/simple_ocp_simultaneous.cpp
	experimental/joel/vdp_lifted_newton.cpp
Change remaining (non-conflicting) entries in the nlp solver signature, #566