Fixed merit function bug in scpgen
Merge branch 'develop' of github.com:jaeandersson/casadi into develop