xmlloader complete
merge conflict
Merge branch 'xmlloader' into develop