snippets annotator
snippet annotator
Merge remote-tracking branch 'origin/master' into xwz

Conflicts:
	project-team04/answer.txt
	project-team04/project.properties
	project-team04/src/main/java/edu/cmu/lti/oaqa/team04/annotators/DocumentAnnotator.java
	project-team04/src/main/resources/descriptors/AaeDescriptor.xml
merge