Modified a few files
Merge branch 'ankurgan'

Conflicts:
	qa4mre-alzheimer-task/src/main/java/edu/cmu/lti/deiis/hw5/indexers/SolrIndexer.java
	qa4mre-alzheimer-task/src/main/java/edu/cmu/lti/deiis/hw5/runner/SimpleQuestionRunCPE.java
	qa4mre-base/src/main/java/edu/cmu/lti/qalab/types/CandidateAnswer.java
Changed question and sentence similarity