| Ayanga & Michael | Removed the usage of conceptID in controller, refactored addConceptDetailsToModel
Merge pull request #13 from mlennon3/master

| Ayanga & Michael | Refactored MCMController
added more concept's related transactional data to the results page.
fix description bug for programs and now renders results page correctly
| Ayanga & Michael | Extracted try/catch in MCMController.executeMerge
| Ayanga & Michael | Refactor MCMController methods
| Ayanga & Michael | Added PreviewErrorValidation.  Refactored MCMController methods to MCService
Merge pull request #14 from mlennon3/master

Ayanga & Michael Refactored MCController
made an interface for preview error validator.
[AS/VS] adding transactional annotations to DAO
Moved the service tests into service test class.
Removing redundant assertions.
Michael | Sancho Added test for updateConceptSets
Michael | Added question about how MCService should be updating sets
Merge pull request #16 from charltonaustin/develop

Tech Debt
Merge pull request #15 from msvivianso/master

[AS/VS] adding transactional annotations to DAO
Michael & Alberto Added test to updateConceptSets
Merge pull request #17 from mlennon3/master

UpdateConceptSets tests
[Vivian/Justin] refactored to have conceptType enum
Michael & Valarie & Asif  Removed multiple ifs from PreviewErrorValidator.hasErrors()