Concept AE
ConceptSearchResults added to jcas
GoPubMed Service classes -- Factory / Singleton and Proxy
Dealing with Uniprot weirdness...
Merge remote-tracking branch 'origin/nwolfe-m1'

Conflicts:
	src/main/resources/descriptors/cpeDescriptor.xml
Updating triples retrieval
Merge branch 'master' of https://github.com/11791-04/project-team04.git

Conflicts:
	src/main/resources/descriptors/cpeDescriptor.xml
Merge branch 'master' of https://github.com/11791-04/project-team04.git

Conflicts:
	src/main/resources/descriptors/cpeDescriptor.xml
Merge remote-tracking branch 'origin/master' into 4_evaluation

Conflicts:
	src/main/resources/descriptors/cpeDescriptor.xml