xml improvements
Merge branch 'development' of https://github.com/hcrudolph/swe-project into development