merge all the files I worked on.
Merge branch 'master' of https://github.com/GeeUnit/hw5-team07

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
	qa4mre-alzheimer-task/XMIs/12-test-alzheimer/QA4MRE-2012_BIOMEDICAL_GS.xml_4.xmi
	qa4mre-alzheimer-task/src/main/java/edu/cmu/lti/deiis/hw5/answer_selection/AnswerSelectionByKCandVoting.java
	qa4mre-alzheimer-task/src/main/resources/SimpleQuestionRunCPE.xml
	qa4mre-alzheimer-task/src/main/resources/SimpleRunCPE.xml
	qa4mre-alzheimer-task/src/main/resources/annotators/SolrIndexer.xml
backup before starting a new branch.
Pruned the simpleRunCPE pipeline.
Merge branch 'master' of https://github.com/GeeUnit/hw5-team07

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
	qa4mre-alzheimer-task/XMIs/12-test-alzheimer/QA4MRE-2012_BIOMEDICAL_GS.xml_4.xmi
	qa4mre-alzheimer-task/src/main/resources/SimpleQuestionRunCPE.xml
Merge branch 'master' of https://github.com/GeeUnit/hw5-team07

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
	qa4mre-alzheimer-task/XMIs/12-test-alzheimer/QA4MRE-2012_BIOMEDICAL_GS.xml_4.xmi
	qa4mre-alzheimer-task/src/main/java/edu/cmu/lti/deiis/hw5/candidate_sentence/QuestionCandSentSimilarityMatcher.java
Merge branch 'master' of https://github.com/GeeUnit/hw5-team07

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
	qa4mre-alzheimer-task/XMIs/12-test-alzheimer/QA4MRE-2012_BIOMEDICAL_GS.xml_4.xmi
	qa4mre-alzheimer-task/src/main/resources/SimpleQuestionRunCPE.xml
	qa4mre-alzheimer-task/src/main/resources/SimpleRunCPE.xml
	qa4mre-alzheimer-task/src/main/resources/annotators/AnswerChoiceCandAnsPMIScorer.xml
corrected the synonym scorer, and the synonym matcher.
Merge branch 'master' of https://github.com/GeeUnit/hw5-team07

Conflicts:
	qa4mre-alzheimer-task/src/main/java/edu/cmu/lti/deiis/hw5/candidate_sentence/QuestionCandSentSimilarityMatcher.java
	qa4mre-alzheimer-task/src/main/resources/SimpleQuestionRunCPE.xml
	qa4mre-alzheimer-task/src/main/resources/SimpleRunCPE.xml
Added some component back to the SimpleRunCPE and SimpleQuestionRunCPE. Last pull was weird, it deleted many component engines from these two AAEs.
Merge branch 'master' of https://github.com/GeeUnit/hw5-team07

Conflicts:
	qa4mre-alzheimer-task/src/main/resources/SimpleQuestionRunCPE.xml
Merge branch 'master' of https://github.com/GeeUnit/hw5-team07

Conflicts:
	qa4mre-alzheimer-task/XMIs/13-blind/QA4MRE11791_with_anwser.xml_1.xmi
	qa4mre-alzheimer-task/XMIs/13-blind/QA4MRE11791_with_anwser.xml_2.xmi
	qa4mre-alzheimer-task/XMIs/13-blind/QA4MRE11791_with_anwser.xml_3.xmi
	qa4mre-alzheimer-task/XMIs/13-blind/QA4MRE11791_with_anwser.xml_5.xmi
	qa4mre-alzheimer-task/XMIs/13-blind/QA4MRE11791_with_anwser.xml_6.xmi
	qa4mre-alzheimer-task/XMIs/13-blind/QA4MRE11791_with_anwser.xml_7.xmi
	qa4mre-alzheimer-task/XMIs/13-blind/QA4MRE11791_with_anwser.xml_8.xmi