merge
merge
Merge branch 'master' of https://github.com/yueranyuan/hw5-team12

Conflicts:
	apache-solr-3.6.2/example/data/index/segments.gen
	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/annotators/StanfordNLPAnnotator.java
merge