Changed schemas to extract named complexType element instead of just having the element.
Merge remote-tracking branch 'origin/master'
Fixed error in closing </unit> tag in report templates