Di's First Commit.

Documnet retrieval and ranking, auxiliary stuffs
Merge branch 'master' of https://github.com/11791-04/project-team04.git

Conflicts:
	src/main/resources/descriptors/cpeDescriptor.xml