UTG

Merge remote-tracking branch 'git_repo/master' into UP-323-add-type-of-bill-codes-per-hta

# Conflicts:
#	input/utg.xml