addition and removal api for concepts
fixing merge conflicts
Merge branch 'master' of https://github.com/hospital-systems/terrminology