changes in queryconcept
cleaning up
merging changes
merging
Merge branch 'master' of git@github.com:11791-01/project-team01.git

Conflicts:
	src/main/java/edu/cmu/lti/deiis/project/annotator/QueryConcept.java