Refactor xsd schema
Merge master
Fix conflicts after merge
Refactor tests for load elements
Return id for tests
Return parent attribute
Merge pull request #373 from kgribov/RefactorSchema

Refactor schema