Refactored
Merge remote-tracking branch 'origin/master'
Refactored
#AP-230 Fixing
xml serializer now format output
#AP-281 Fixed
Merge remote-tracking branch 'origin/master'