duplicated line
Merge branch 'master' into flexModel
redid Parent and EndNode members, moved enumeration index into only end-nodes