bla
Merge branch 'master' of https://github.com/timak/CDSS

Conflicts:
	CDSS_TEXTMINING/src/stuba/fei/tp/cdss/service/TextMiningDataServiceImpl.java