Exact answer
Merge remote-tracking branch 'origin/xiaohan' into cyc

Conflicts:
	project-team05/project.properties
	project-team05/src/main/java/edu/cmu/lti/f14/team05/BioAsqAnnotator.java
+ stopwords