json output: write 1 file instead of two and change field names
Merge branch 'develop' of github.com:casadi/casadi into develop