Fixed OutputRunCasConsumer so that it outputs proper r_id's.
local merge
added renamed "_z" files
Merge branch 'master' of https://github.com/GeeUnit/hw5-team07.git

Conflicts:
	qa4mre-alzheimer-task/src/main/java/edu/cmu/lti/deiis/hw5/answer_ranking/AnswerChoiceMoreCandAnsPMIScorer.java
	qa4mre-alzheimer-task/src/main/java/edu/cmu/lti/deiis/hw5/answer_selection/AnswerSelectionPMIByKCandVoting.java
	qa4mre-alzheimer-task/src/main/resources/annotators/AnswerSelectionByKCandVoting_z.xml
	qa4mre-alzheimer-task/src/main/resources/annotators/QuestionAnswerCandSentSimilarityMatcher_z.xml