changed formating of xml on api
merged conflicts
Merge branch 'master' into master_test