[TW CodeJam] Refactor MergeConceptsControllerTest and MergeConceptsServiceImpl.
Merge branch 'master' of https://github.com/openmrs/openmrs-module-mergeconcepts
[TW CodeJam] Uncomment test on newDrugs in MergeConceptsManageControllerTest.
[Steve] Refactor MergeConceptsServiceImpl and MergeConceptsManageControllerTest.
[Steve] Refactor MergeConceptsServiceImpl, MergeConceptsService, HibernateMergeConceptsDAO, and PreviewErrorValidator
[Steve] Add space at bottom of preview and results page so links aren't hidden by footer.
Changed merge jsp to display program name
Merge pull request #21 from msvivianso/master

[Vivian/Asif/Michael] tested the updating of PersonAttributeType
Merge pull request #22 from spwntr/master

ThoughtWorks Chicago CodeJam and Friday afternoon refactoring with a bug fix.
Merge pull request #23 from mlennon3/master

Ayanga & Michael | Changed merge jsp to display program name
Refactored the two test classes into one
Merge pull request #24 from mlennon3/test-rename

Michael | Tech Debt | Refactored the two test classes into one
Changed openmrs version to 1.9.7 in pom.xml; fixed compatibility issues in tests
Merge pull request #25 from albertsaave/master

Changed openmrs version to 1.9.7 in pom.xml; fixed compatibility issues ...