Merge pull request #602 from ndawe/master

initialize ConstraintType in ShapeSys