merge xml support and bugfixes

This commit is contained in:
Kevin Jahns
2014-09-26 10:57:17 +02:00
45 changed files with 1272 additions and 1004 deletions

File diff suppressed because one or more lines are too long