Merge pull request #1 from shilad/dev

Dev
Merge branches 'dev' and 'master' of https://github.com/shilad/sem-tag into dev
added a ConceptMapper to ConceptDao
added a getConcept method to ConceptMapper
Lots of concept things