GAIAEH-192 HL7 VXU Submission Completed
Merge branch 'master' of https://github.com/gaiaehr/gaiaehr

Conflicts:
	langs/en_US.php