Merge pull request #760 from Alex-van-der-Peet/master

Fixes embodiment.conf module paths and an .xsd file renaming issue.