Merge pull request #6 from kuoliu/master

Merging Kuo's changes.
Merge pull request #7 from kuoliu/master

allow solr to run locally
Add a simple survey file for data to data folder.
Temp commit, prior to fetching from origin repo.
Added SymbolAnnotator.java, updated TypeSystemDescriptor.xml (and
resulting types)

Conflicts:
	qa4mre-alzheimer-task/results/12-test-alzheimer/Biomedical_about_Alzheimer_Sample_GS.xml_1.xmi
	qa4mre-alzheimer-task/results/12-test-alzheimer/QA4MRE-2012_BIOMEDICAL_GS.xml_1.xmi
	qa4mre-alzheimer-task/results/12-test-alzheimer/QA4MRE-2012_BIOMEDICAL_GS.xml_2.xmi
	qa4mre-alzheimer-task/results/12-test-alzheimer/QA4MRE-2012_BIOMEDICAL_GS.xml_3.xmi
	qa4mre-alzheimer-task/results/12-test-alzheimer/QA4MRE-2012_BIOMEDICAL_GS.xml_4.xmi
Included SymbolAnnotator.xml
Modified the type system for Coref and more phrases
Modified the type system for Coref and more phrases
Generated new types after modifying type system for Coref
Merge branch 'master' of https://github.com/larsmahler/hw5-team08.git
Coreference Done! Type System Finalized.
change the solr index, add the co-ref and synonyms
change the scoring function to PMI
add new solr start.jar
New AcronymAnnotator.xml and AcronymAnnotator.java
Upload M1 presentation.

Note: AcronymAnnotator not ready yet - still getting null pointer
errors.

Conflicts:
	qa4mre-alzheimer-task/XMIs/12-test-alzheimer/QA4MRE-2012_BIOMEDICAL_GS.xml_1.xmi
	qa4mre-alzheimer-task/XMIs/12-test-alzheimer/QA4MRE-2012_BIOMEDICAL_GS.xml_2.xmi
	qa4mre-alzheimer-task/XMIs/12-test-alzheimer/QA4MRE-2012_BIOMEDICAL_GS.xml_3.xmi
add solr zip file
Revision includes AnswerHeuristic annotator
Merge remote-tracking branch 'origin/master'
update the typesystem to add the "candidateSentenceList" for Answer
change the solr PMI xml descriptor to change the solr to local PMI
update the SolrIndexer to avoid indexing same coreference string
add solr query for answers to get candidate sentence for answer
Added Targets to the question