Merge pull request #542 from tadeitto/TRUNK-3283 TRUNK-3283 Add observation to an encounter: the field person can be over...[d31bfa5_BAM_file_list]
[d31bfa5_BAM_hash]2d2b4b8aeb18d4a985b370de0e572488bde4452a
[d31bfa5_BAM_commiter_name]dkayiwa
[d31bfa5_BAM_commiter_email]dkayiwa@openmrs.org
[d31bfa5_BAM_timestamp]1389961655
[d31bfa5_BAM_commit_message]Merge pull request #549 from lrozanski/TRUNK-3898-master TRUNK-3898: Retired and hidden ConceptMapTypes should be at the end of the list[d31bfa5_BAM_file_list]
[d31bfa5_BAM_hash]f2d99ca3f3ec8c7afea99bbe60d7d402cbaf7414
[d31bfa5_BAM_commiter_name]Lech Rozanski
[d31bfa5_BAM_commiter_email]lrozanski@soldevelo.com
[d31bfa5_BAM_timestamp]1389952517
[d31bfa5_BAM_commit_message]TRUNK-3898: Retired and hidden ConceptMapTypes should be at the end of the list