[Alberto] reorganized code; refactor conceptType to MergeConcepType; modified addConceptDetailsToModel to addConceptReferencesToView method.
Merge pull request #29 from albertsaave/master

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