Shallow water: Added multiple finite elements
Fixed bug in shallow water
Merge branch 'develop' of github.com:casadi/casadi into develop