Merge branch 'master' of https://github.com/MostafaDehghani/EuroVocMLC

Conflicts:
	nbactions.xml