translator working
Merge branch 'master' of https://github.com/Gaussi/encyclopedia-maker

Conflicts:
	xmlTranslator/src/KnowledgeSourceFileReader.java
	xmlTranslator/src/TxtFileReader.java
	xmlTranslator/src/xmlTranslatroRun.java