-Support for the createOrUpdate tag in the user-friendly xml
-Fix of a bug in the merge process where a recursive definition in the
xsd file causes a stack overflow.
-Fix of a bug in the merge process where the XOSParser was not finding
the correct tag definition when searching through the xsd