Issue #79
Merge remote-tracking branch 'origin/dev'

Conflicts:
	net.ostis.confman.ui/resourses/MessagesBundle_ru_RU.properties