Merge aeDescriptor
Merge branch 'master' of https://github.com/11791-5/project-team5.git

Conflicts:
	project-team05/src/main/resources/analysis_engine/aeDescriptor.xml
Merge branch 'master' of https://github.com/11791-5/project-team5.git
Merge branch 'master' of https://github.com/11791-5/project-team5.git
Merge branch 'master' of https://github.com/11791-5/project-team5.git
Working answer extractor
Merge branch 'master' of https://github.com/11791-5/project-team5.git

Conflicts:
	project-team05/src/main/java/edu/cmu/lti/oaqa/annotators/ConceptAnnotator.java
	project-team05/src/main/java/edu/cmu/lti/oaqa/annotators/QueryOptimizer.java
Abner and LingPipe addition