Changed documentation to nsofa and nabaqus
Changed displacementConstraint
Merge branch 'master' of https://github.com/CognitionGuidedSurgery/msml

Conflicts:
	share/alphabet/constraints/displacementConstraint.xml