added the Concept object and modified the RestConceptService and test
fixed some conflict
Merge branch 'development' of https://github.com/DICE-UNC/irods-hive into development
edited the searchService and test