test
Merge branch 'master' of github.com:acado/acado
Extended OCP and Objective classes to support extended functions.

This is code generation related, only.
Merge branch 'master' of github.com:mvukov/acado
fixed some bugs related to NARX models