retrive and classify edit
Merge remote-tracking branch 'upstream/master'

Conflicts:
	InformationRetriever/src/main/resources/retriver.properties