[Alberto] reorganized code; refactor conceptType to MergeConcepType; modified addConceptDetailsToModel to addConceptReferencesToView method.