Merge pull request #33 from jblowe/master

UCBG-301, NOJIRA: minor tweaks to iReports .jrxml files, improvements to UCBG Location list, etc.
Merge pull request #34 from jblowe/master

NOJIRA: repair code damaged by attempt to deal with merge.
Merge pull request #35 from jblowe/master

NOJIRA: fix bar code upload
PAHMA-855: archive XmlMerge
Merge pull request #36 from yuteh/master

PAHMA-855: archive XmlMerge
PAHMA-801: Make Group reprorts consistent
Merge pull request #37 from chrshffmn/master

PAHMA-801: Make Group reports consistent
Merge pull request #38 from jblowe/master

PAHMA-859, PAHMA-860, PAHMA-861, UCBG-301, UCBG-307, UCBG-308: see commits for details
Merge pull request #39 from jblowe/master

PAHMA-857: barcode BOM fix
Merge remote-tracking branch 'upstream/master'