[Vivian/Justin] refactored to have conceptType enum
Merge pull request #20 from mlennon3/master

Michael & Valarie & Asif Removed multiple ifs from PreviewErrorValidator.hasErrors()
Merge pull request #18 from msvivianso/master

[Vivian/Justin] refactored to have conceptType enum
Changed merge jsp to display program name