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

Conflicts:
	project-team05/src/main/java/edu/cmu/lti/f14/team05/DocumentAnnotator.java
Merge remote-tracking branch 'origin/xiaohan' into cyc
resolve conflict
exact answer
Merge remote-tracking branch 'origin/cyc' into xiaohan

Conflicts:
	project-team05/src/main/java/edu/cmu/lti/f14/team05/DocumentAnnotator.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/answer/Answer.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/answer/AnswerList.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/answer/AnswerList_Type.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/answer/Answer_Type.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/answer/CandidateAnswerVariant.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/answer/CandidateAnswerVariant_Type.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/answer/Summary.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/answer/Summary_Type.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/input/Question.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/input/Question_Type.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/kb/Concept.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/kb/ConceptMention.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/kb/ConceptMention_Type.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/kb/Concept_Type.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/kb/Entity.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/kb/EntityMention.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/kb/EntityMention_Type.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/kb/Entity_Type.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/kb/Interpretation.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/kb/Interpretation_Type.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/kb/Relation.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/kb/RelationMention.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/kb/RelationMention_Type.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/kb/Relation_Type.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/kb/Triple.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/kb/Triple_Type.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/nlp/AnswerType.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/nlp/AnswerType_Type.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/nlp/CandidateAnswerOccurrence.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/nlp/CandidateAnswerOccurrence_Type.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/nlp/Focus.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/nlp/Focus_Type.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/nlp/LexicalAnswerType.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/nlp/LexicalAnswerType_Type.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/nlp/Parse.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/nlp/Parse_Type.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/nlp/SemanticRole.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/nlp/SemanticRole_Type.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/nlp/Token.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/nlp/Token_Type.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/retrieval/AbstractQuery.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/retrieval/AbstractQuery_Type.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/retrieval/AnswerSearchResult.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/retrieval/AnswerSearchResult_Type.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/retrieval/AtomicQueryConcept.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/retrieval/AtomicQueryConcept_Type.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/retrieval/ComplexQueryConcept.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/retrieval/ComplexQueryConcept_Type.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/retrieval/ConceptSearchResult.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/retrieval/ConceptSearchResult_Type.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/retrieval/Document.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/retrieval/Document_Type.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/retrieval/Passage.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/retrieval/PassageFromRelation.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/retrieval/PassageFromRelation_Type.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/retrieval/Passage_Type.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/retrieval/QueryConcept.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/retrieval/QueryConcept_Type.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/retrieval/QueryOperator.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/retrieval/QueryOperator_Type.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/retrieval/Search.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/retrieval/SearchResult.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/retrieval/SearchResult_Type.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/retrieval/Search_Type.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/retrieval/TripleSearchResult.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/type/retrieval/TripleSearchResult_Type.java