[Alberto] reorganized code; refactor conceptType to MergeConcepType; mod...

...ified addConceptDetailsToModel to addConceptReferencesToView method.