logger
Merge remote-tracking branch 'origin/master' into restfull

Conflicts:
	translator/src/main/resources/DB/en-ru