Fixed merit function bug in scpgen
Merge branch 'develop' of github.com:jaeandersson/casadi into develop
Introducing optoy: a very simple (toy-level) optimization interface
automatic documentation update
automatic casadibot merge